diff options
| -rw-r--r-- | pavement.py | 70 | ||||
| -rw-r--r-- | paver-minilib.zip | bin | 26246 -> 0 bytes | |||
| -rw-r--r-- | pyload/Core.py | 10 | ||||
| -rw-r--r-- | pyload/InitHomeDir.py | 1 | ||||
| -rw-r--r-- | pyload/__init__.py | 4 | ||||
| -rw-r--r-- | setup.py | 73 |
6 files changed, 76 insertions, 82 deletions
diff --git a/pavement.py b/pavement.py index 654a72df1..7c34a5bc8 100644 --- a/pavement.py +++ b/pavement.py @@ -1,13 +1,7 @@ # -*- coding: utf-8 -*- - from paver.easy import * -from paver.setuputils import setup - -try: - from paver.doctools import cog -except: - cog = None +from paver.doctools import cog import fnmatch @@ -31,60 +25,9 @@ from subprocess import call, Popen PROJECT_DIR = path(__file__).dirname() sys.path.append(PROJECT_DIR) -options = environment.options - -extradeps = [] -if sys.version_info <= (2, 5): - extradeps += 'simplejson' - -setup( - name="pyload", - version="0.5.0", - description='Fast, lightweight and full featured download manager.', - long_description=open(PROJECT_DIR / "README.md").read(), - keywords=('pyload', 'download-manager', 'one-click-hoster', 'download'), - url="http://pyload.org", - download_url='http://pyload.org/download', - license='AGPL v3', - author="pyLoad Team", - author_email="support@pyload.org", - platforms=('Any',), - #package_dir={'pyload': 'src'}, - packages=['pyload'], - #package_data=find_package_data(), - #data_files=[], - include_package_data=True, - exclude_package_data={'pyload': ['docs*', 'scripts*', 'tests*']}, #exluced from build but not from sdist - # 'bottle >= 0.10.0' not in list, because its small and contain little modifications - install_requires=['pycurl', 'Beaker >= 1.6'] + extradeps, - extras_require={ - 'SSL': ["pyOpenSSL"], - 'DLC': ['pycrypto'], - 'Lightweight webserver': ['bjoern'], - 'RSS plugins': ['feedparser'], - 'Few Hoster plugins': ['BeautifulSoup>=3.2, <3.3'] - }, - #setup_requires=["setuptools_hg"], - test_suite='nose.collector', - tests_require=['nose', 'websocket-client >= 0.8.0', 'requests >= 1.2.2'], - entry_points={ - 'console_scripts': [ - 'pyload = pyload.Core:main', - 'pyload-cli = pyload.cli.Cli:main' - ]}, - zip_safe=False, - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Topic :: Internet :: WWW/HTTP", - "Environment :: Console", - "Environment :: Web Environment", - "Intended Audience :: End Users/Desktop", - "License :: OSI Approved :: GNU Affero General Public License v3", - "Operating System :: OS Independent", - "Programming Language :: Python :: 2" - ] -) +from pyload import __version__ +options = environment.options options( sphinx=Bunch( builddir="_build", @@ -105,7 +48,7 @@ options( # xgettext args xargs = ["--from-code=utf-8", "--copyright-holder=pyLoad Team", "--package-name=pyLoad", - "--package-version=%s" % options.version, "--msgid-bugs-address='bugs@pyload.org'"] + "--package-version=%s" % __version__, "--msgid-bugs-address='bugs@pyload.org'"] @task @@ -117,11 +60,6 @@ def html(): call_task('paver.doctools.html') -@task -@needs('clean', 'generate_setup', 'webapp', 'setuptools.command.sdist') -def sdist(): - """ Build source code package with distutils """ - @task @cmdopts([ diff --git a/paver-minilib.zip b/paver-minilib.zip Binary files differdeleted file mode 100644 index 1f8dc5631..000000000 --- a/paver-minilib.zip +++ /dev/null diff --git a/pyload/Core.py b/pyload/Core.py index 16740bafa..15b036c7a 100644 --- a/pyload/Core.py +++ b/pyload/Core.py @@ -19,11 +19,10 @@ # @version: v0.5.0 ############################################################################### -CURRENT_VERSION = '0.4.9.9-dev' +from pyload import __version__ as CURRENT_VERSION import __builtin__ - from getopt import getopt, GetoptError import logging import logging.handlers @@ -42,6 +41,7 @@ import subprocess subprocess.__doc__ = None # the module with the largest doc we are using import InitHomeDir + from AccountManager import AccountManager from config.ConfigParser import ConfigParser from config.ConfigManager import ConfigManager @@ -645,7 +645,7 @@ def deamon(): pyload_core = Core() pyload_core.start() - +# And so it begins... def main(): #change name to 'pyLoadCore' #from module.lib.rename_process import renameProcess @@ -662,6 +662,6 @@ def main(): pyload_core.removeLogger() _exit(1) -# And so it begins... + if __name__ == "__main__": - main()
\ No newline at end of file + print "This file can not be started directly."
\ No newline at end of file diff --git a/pyload/InitHomeDir.py b/pyload/InitHomeDir.py index c255913de..d24837d83 100644 --- a/pyload/InitHomeDir.py +++ b/pyload/InitHomeDir.py @@ -36,7 +36,6 @@ if 'pyload' in sys.modules: if abs_pyload != rel_pyload: sys.modules['pyload'].__path__.insert(0, abs_pyload) - sys.path.append(join(pypath, "pyload", "lib")) homedir = "" diff --git a/pyload/__init__.py b/pyload/__init__.py index e69de29bb..b72ac12e9 100644 --- a/pyload/__init__.py +++ b/pyload/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +__version_info__ = ('0', '4', '9', '9') +__version__ = '.'.join(__version_info__) + "-dev"
\ No newline at end of file @@ -1,10 +1,63 @@ -try: - import paver.tasks -except ImportError: - from os.path import exists - if exists("paver-minilib.zip"): - import sys - sys.path.insert(0, "paver-minilib.zip") - import paver.tasks - -paver.tasks.main() +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import sys +from os import path + +from setuptools import setup + +PROJECT_DIR = path.abspath(path.dirname(__file__)) + +extradeps = [] +if sys.version_info <= (2, 5): + extradeps += 'simplejson' + +from pyload import __version__ + +setup( + name="pyload", + version=__version__, + description='Fast, lightweight and full featured download manager.', + long_description=open(path.join(PROJECT_DIR, "README.md")).read(), + keywords=('pyload', 'download-manager', 'one-click-hoster', 'download'), + url="http://pyload.org", + download_url='http://pyload.org/download', + license='AGPL v3', + author="pyLoad Team", + author_email="support@pyload.org", + platforms=('Any',), + #package_dir={'pyload': 'src'}, + packages=['pyload'], + #package_data=find_package_data(), + #data_files=[], + include_package_data=True, + exclude_package_data={'pyload': ['docs*', 'scripts*', 'tests*']}, #exluced from build but not from sdist + # 'bottle >= 0.10.0' not in list, because its small and contain little modifications + install_requires=['pycurl', 'Beaker >= 1.6'] + extradeps, + extras_require={ + 'SSL': ["pyOpenSSL"], + 'DLC': ['pycrypto'], + 'Lightweight webserver': ['bjoern'], + 'RSS plugins': ['feedparser'], + 'Few Hoster plugins': ['BeautifulSoup>=3.2, <3.3'] + }, + #setup_requires=["setuptools_hg"], + test_suite='nose.collector', + tests_require=['nose', 'websocket-client >= 0.8.0', 'requests >= 1.2.2'], + entry_points={ + 'console_scripts': [ + 'pyload = pyload.Core:main', + 'pyload-cli = pyload.cli.Cli:main' + ]}, + zip_safe=False, + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Topic :: Internet :: WWW/HTTP", + "Environment :: Console", + "Environment :: Web Environment", + "Intended Audience :: End Users/Desktop", + "License :: OSI Approved :: GNU Affero General Public License v3", + "Operating System :: OS Independent", + "Programming Language :: Python :: 2" + ] +)
\ No newline at end of file |