aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-31 13:30:28 +0200
committermakefu <github@syntax-fehler.de>2015-08-31 13:30:28 +0200
commit7e84b09094578e03f194f661172c669bbc60edce (patch)
treeddbad2d5a944def1f56540560b00e3c9badae8bf
parentbeca84306888be2a627ae2ab14530f853b1218ed (diff)
Reaktor: cleanup, bump version
l---------public_commands/caps1
l---------public_commands/hello1
l---------public_commands/reload1
l---------public_commands/retard1
l---------public_commands/rev1
l---------public_commands/uptime1
-rwxr-xr-xreaktor/commands/caps2
-rwxr-xr-xreaktor/commands/licht_resolver2
-rw-r--r--reaktor/config.py3
-rw-r--r--setup.py12
l---------udp_commands/licht_resolver1
11 files changed, 13 insertions, 13 deletions
diff --git a/public_commands/caps b/public_commands/caps
deleted file mode 120000
index 43c0a34..0000000
--- a/public_commands/caps
+++ /dev/null
@@ -1 +0,0 @@
-../commands/caps \ No newline at end of file
diff --git a/public_commands/hello b/public_commands/hello
deleted file mode 120000
index 4509249..0000000
--- a/public_commands/hello
+++ /dev/null
@@ -1 +0,0 @@
-../commands/hello \ No newline at end of file
diff --git a/public_commands/reload b/public_commands/reload
deleted file mode 120000
index 9a33785..0000000
--- a/public_commands/reload
+++ /dev/null
@@ -1 +0,0 @@
-../commands/reload \ No newline at end of file
diff --git a/public_commands/retard b/public_commands/retard
deleted file mode 120000
index 29ae4b0..0000000
--- a/public_commands/retard
+++ /dev/null
@@ -1 +0,0 @@
-../commands/retard \ No newline at end of file
diff --git a/public_commands/rev b/public_commands/rev
deleted file mode 120000
index f543341..0000000
--- a/public_commands/rev
+++ /dev/null
@@ -1 +0,0 @@
-../commands/rev \ No newline at end of file
diff --git a/public_commands/uptime b/public_commands/uptime
deleted file mode 120000
index ffe5fbd..0000000
--- a/public_commands/uptime
+++ /dev/null
@@ -1 +0,0 @@
-../commands/uptime \ No newline at end of file
diff --git a/reaktor/commands/caps b/reaktor/commands/caps
index ac8cc66..b5d6642 100755
--- a/reaktor/commands/caps
+++ b/reaktor/commands/caps
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python
import imp
import os
diff --git a/reaktor/commands/licht_resolver b/reaktor/commands/licht_resolver
index 5bdb651..90d06c8 100755
--- a/reaktor/commands/licht_resolver
+++ b/reaktor/commands/licht_resolver
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
# -*- coding: utf-8 -*-
map = {
diff --git a/reaktor/config.py b/reaktor/config.py
index 8582432..56ef71e 100644
--- a/reaktor/config.py
+++ b/reaktor/config.py
@@ -102,7 +102,8 @@ public_commands = [
default_command('tell', cmd='tell-on_privmsg', env={
'state_file': workdir + '/tell.txt'
}),
- default_command('nag', env=nag_env),
+ # TODO this is disabled until someone fixes it
+ #default_command('nag', env=nag_env),
simple_command('identify', env={
'config_filename': config_filename
}),
diff --git a/setup.py b/setup.py
index 959d4c7..7b78171 100644
--- a/setup.py
+++ b/setup.py
@@ -3,17 +3,21 @@ from setuptools import setup
setup(
name='Reaktor',
- version='0.2.3',
+ version='0.3.2',
description='an IRC bot based on asyn* libs',
long_description=open("README.md").read(),
license='WTFPL',
- url='http://localhost/',
- download_url='http://localhost/',
+ url='http://krebsco.de/',
+ download_url='https://pypi.python.org/pypi/Reaktor/',
author='krebs',
author_email='spam@krebsco.de',
install_requires = [ 'docopt' ],
+ extras_require = {
+ # 'all-plugins' : ['dnsrecon'] < not yet in pypi
+ },
+
packages=['reaktor'],
# optional non-python Deps:
# whatweb in path for 'whatweb'
@@ -21,6 +25,7 @@ setup(
# host for 'taken'
# whois for 'whois'
# git for 'nag'
+ package_data = {'reaktor' : ['commands/*'] },
entry_points={
'console_scripts' : [
'reaktor = reaktor.core:main'
@@ -31,6 +36,7 @@ setup(
"Intended Audience :: Developers",
"Natural Language :: English",
"Operating System :: POSIX :: Linux",
+ "Development Status :: 3 - Alpha",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
diff --git a/udp_commands/licht_resolver b/udp_commands/licht_resolver
deleted file mode 120000
index 0d8b095..0000000
--- a/udp_commands/licht_resolver
+++ /dev/null
@@ -1 +0,0 @@
-../commands/licht_resolver \ No newline at end of file