From 7e84b09094578e03f194f661172c669bbc60edce Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 31 Aug 2015 13:30:28 +0200 Subject: Reaktor: cleanup, bump version --- public_commands/caps | 1 - public_commands/hello | 1 - public_commands/reload | 1 - public_commands/retard | 1 - public_commands/rev | 1 - public_commands/uptime | 1 - reaktor/commands/caps | 2 +- reaktor/commands/licht_resolver | 2 +- reaktor/config.py | 3 ++- setup.py | 12 +++++++++--- udp_commands/licht_resolver | 1 - 11 files changed, 13 insertions(+), 13 deletions(-) delete mode 120000 public_commands/caps delete mode 120000 public_commands/hello delete mode 120000 public_commands/reload delete mode 120000 public_commands/retard delete mode 120000 public_commands/rev delete mode 120000 public_commands/uptime delete mode 120000 udp_commands/licht_resolver 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 -- cgit v1.2.3