From 56982bdd268f490160d30c2552620fdd0083b9e9 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Sun, 31 May 2020 19:43:18 +0200 Subject: [PATCH] Adding back sdist to fix issues with optional extras --- MANIFEST.in | 9 ++++++ django_q/__init__.py | 2 +- docs/conf.py | 2 +- pyproject.toml | 2 +- setup.cfg | 2 ++ setup.py | 69 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 MANIFEST.in create mode 100644 setup.cfg create mode 100644 setup.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..3c28bd69 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,9 @@ +include LICENSE +include README.rst +include CHANGELOG. +recursive-include django_q/locale * +include django_q/management/*.py +include django_q/management/commands/*.py +include django_q/migrations/*.py +include django_q/brokers/*.py +include django_q/tests/*.py diff --git a/django_q/__init__.py b/django_q/__init__.py index 92e8c012..bbb2d90d 100644 --- a/django_q/__init__.py +++ b/django_q/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 2, 2) +VERSION = (1, 2, 3) default_app_config = 'django_q.apps.DjangoQConfig' diff --git a/docs/conf.py b/docs/conf.py index 386e2f6c..d565f3c6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,7 +73,7 @@ # The short X.Y version. version = '1.2' # The full version, including alpha/beta/rc tags. -release = '1.2.2' +release = '1.2.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pyproject.toml b/pyproject.toml index 73959878..35c393d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-q" -version = "1.2.2" +version = "1.2.3" description = "A multiprocessing distributed task queue for Django" authors = ["Ilan Steemers "] license = "MIT" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..68c61a22 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=0 \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..e9190524 --- /dev/null +++ b/setup.py @@ -0,0 +1,69 @@ +import os +from setuptools import setup, Command + +with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme: + README = readme.read() + +os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) + + +class PyTest(Command): + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + import subprocess + import sys + + errno = subprocess.call([sys.executable, 'runtests.py']) + raise SystemExit(errno) + + +setup( + name='django-q', + version='1.2.3', + author='Ilan Steemers', + author_email='koed00@gmail.com', + keywords='django multiprocessing worker scheduler queue', + packages=['django_q'], + include_package_data=True, + url='https://django-q.readthedocs.org', + license='MIT', + description='A multiprocessing distributed task queue for Django', + long_description=README, + install_requires=['django>=2.2', 'django-picklefield', 'blessed', 'arrow'], + test_requires=['pytest', 'pytest-django', ], + cmdclass={'test': PyTest}, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Operating System :: POSIX', + 'Operating System :: MacOS', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Topic :: Internet :: WWW/HTTP', + 'Topic :: System :: Distributed Computing', + 'Topic :: Software Development :: Libraries :: Python Modules', + ], + entry_points={ + 'djangoq.errorreporters': [ + 'rollbar = django_q_rollbar:Rollbar', + 'sentry = django_q_sentry:Sentry', + ] + }, + extras_require={ + 'rollbar': ["django-q-rollbar>=0.1"], + 'sentry': ["django-q-sentry>=0.1"], + } +)