Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop support for old versions of python/django/celery #62

Merged
merged 8 commits into from
Jul 14, 2016
Merged

Drop support for old versions of python/django/celery #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75df213
Only support Django 1.8+, Celery 3.1+, py2.7 and py3.5
winhamwr Jul 13, 2016
5afd6a3
Seems like a good excuse for bumping to 1.0!
winhamwr Jul 13, 2016
a4c9d71
Missed a Celery 2.5 => 3.1 change
winhamwr Jul 13, 2016
e0689ab
We shall Django 1.4 no more, forever.
winhamwr Jul 13, 2016
894bbf7
Change setup.py to use find_packages so we get subdirectories - see #37
rhunwicks Jul 13, 2016
c05a7ac
Re-added support for Django 1.6 and 1.7 based on feedback
winhamwr Jul 14, 2016
25ba2a6
Removed some django 1.4 support cruft
winhamwr Jul 14, 2016
ba519ad
Pegged django-nose, since they dropped Django <1.8 support
winhamwr Jul 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,17 @@ language: python
sudo: false
python: 3.5
env:
- TOX_ENV=py26-django1.4.X-djangocelery2.5.X-celery2.5.X
- TOX_ENV=py27-django1.4.X-djangocelery2.5.X-celery2.5.X
- TOX_ENV=py26-django1.4.X-djangocelery3.0.X
- TOX_ENV=py26-django1.4.X-djangocelery3.1.X
- TOX_ENV=py26-django1.6.X-djangocelery3.0.X
- TOX_ENV=py26-django1.6.X-djangocelery3.1.X
- TOX_ENV=py27-django1.4.X-djangocelery3.0.X
- TOX_ENV=py27-django1.4.X-djangocelery3.1.X
- TOX_ENV=py27-django1.6.X-djangocelery3.0.X
- TOX_ENV=py27-django1.6.X-djangocelery3.1.X
- TOX_ENV=py27-django1.7.X-djangocelery3.0.X
- TOX_ENV=py27-django1.7.X-djangocelery3.1.X
- TOX_ENV=py27-django1.8.X-djangocelery3.1.X
- TOX_ENV=py34-django1.7.X-djangocelery3.1.X
- TOX_ENV=py34-django1.8.X-djangocelery3.1.X
- TOX_ENV=py27-django1.9.X-djangocelery3.1.X
- TOX_ENV=py34-django1.9.X-djangocelery3.1.X
- TOX_ENV=py26-django1.4.X-celery3.1.X
- TOX_ENV=py26-django1.6.X-celery3.1.X
- TOX_ENV=py27-django1.4.X-celery3.1.X
- TOX_ENV=py35-django1.8.X-djangocelery3.1.X
- TOX_ENV=py35-django1.9.X-djangocelery3.1.X
- TOX_ENV=py27-django1.6.X-celery3.1.X
- TOX_ENV=py27-django1.7.X-celery3.1.X
- TOX_ENV=py27-django1.8.X-celery3.1.X
- TOX_ENV=py34-django1.7.X-celery3.1.X
- TOX_ENV=py34-django1.8.X-celery3.1.X
- TOX_ENV=py27-django1.9.X-celery3.1.X
- TOX_ENV=py34-django1.9.X-celery3.1.X
- TOX_ENV=py35-django1.8.X-djangocelery3.1.X
- TOX_ENV=py35-django1.8.X-celery3.1.X
- TOX_ENV=py35-django1.9.X-djangocelery3.1.X
- TOX_ENV=py35-django1.9.X-celery3.1.X
- TOX_ENV=flake8
install: pip install tox
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You could write all of the stuff yourself, but why?

On Ubuntu, that means running:

`$ sudo apt-get install build-essential python-dev python2.6-dev python2.7-dev rabbitmq-server`
`$ sudo apt-get install build-essential python-dev python2.7-dev python3.5-dev rabbitmq-server`

On OS X, you'll need to run the "XcodeTools" installer.

Expand Down Expand Up @@ -459,7 +459,7 @@ Until then,
you can run tests against supported combos with:

$ pip install tox
$ tox -e py26-django1.4.X-djangocelery2.5.X-celery2.5.X
$ tox -e py27-django1.8.X-djangocelery3.1.X-celery3.1.X

Our test suite currently only tests usage with Django,
which is definitely a [bug](https://github.com/PolicyStat/jobtastic/issues/15).
Expand Down Expand Up @@ -488,7 +488,7 @@ Yes. Increasingly so.
## Project Status

Jobtastic is currently known to work
with Django 1.3-1.5 and Celery 2.5-3.0.
with Django 1.6+ and Celery 3.1.X
The goal is to support those versions and newer.
Please file issues if there are problems
with newer versions of Django/Celery.
Expand Down
2 changes: 1 addition & 1 deletion jobtastic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Make your user-facing Celery jobs totally awesomer"""

VERSION = (0, 3, 1, '')
VERSION = (1, 0, 0, 'a1')
__version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
__author__ = 'Wes Winham'
__contact__ = '[email protected]'
Expand Down
2 changes: 1 addition & 1 deletion requirements/default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
psutil>=3.0,<4
celery>=2.5,<4
celery>=3.1,<4
2 changes: 1 addition & 1 deletion requirements/tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
django-nose
django-nose==1.4.3 # 1.4.4 drops django <1.8 support
unittest2
mock
django-picklefield==0.3.1
Expand Down
21 changes: 4 additions & 17 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
import sys

from setuptools import setup, Command
from setuptools import setup, find_packages, Command

long_description = codecs.open("README.md", "r", "utf-8").read()

Expand Down Expand Up @@ -121,23 +121,10 @@ def run(self):
'testproj.settings',
)

django_1_4 = False
try:
from django.core.management import execute_manager as run_command
django_1_4 = True
except ImportError:
# execute_manager was renamed in Django 1.6
from django.core.management import (
execute_from_command_line as run_command,
)
from django.core.management import execute_from_command_line

modified_args = [__file__, 'test'] + self.extra_args
if django_1_4:
settings_file = os.environ['DJANGO_SETTINGS_MODULE']
settings_mod = __import__(settings_file, {}, {}, [''])
run_command(settings_mod, argv=modified_args)
else:
run_command(modified_args)
execute_from_command_line(modified_args)

def initialize_options(self):
pass
Expand All @@ -154,7 +141,7 @@ def finalize_options(self):
author_email=meta['contact'],
url=meta['homepage'],
long_description=long_description,
packages=[NAME],
packages=find_packages(),
license='BSD',
platforms=['any'],
classifiers=CLASSIFIERS,
Expand Down
11 changes: 2 additions & 9 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[tox]
envlist =
py{26,27}-django{1.4.X,1.6.X}-djangocelery{3.0.X,3.1.X},
py{26,27}-django1.4.X-djangocelery2.5.X-celery2.5.X,
py{27,34}-django{1.7.X,1.8.X,1.9.X}-djangocelery{3.1.X},
py{26,27}-django{1.4.X,1.6.X}-celery3.1.X,
py{27,34}-django{1.7.X,1.8.X,1.9.X}-celery3.1.X,
py27-django{1.6.X,1.7.X,1.8.X,1.9.X}-djangocelery3.1.X,
py27-django{1.6.X,1.7.X,1.8.X,1.9.X}-celery3.1.X,
py35-django{1.8.X,1.9.X}-djangocelery3.1.X,
py35-django{1.8.X,1.9.X}-celery3.1.X,
flake8
Expand All @@ -13,12 +10,8 @@ envlist =
commands = {envpython} setup.py test
deps =
-r{toxinidir}/requirements/tests.txt
celery2.5.X: celery>=2.5,<2.6
celery3.1.X: celery>=3.1,<3.2
djangocelery2.5.X: django-celery>=2.5,<2.6
djangocelery3.0.X: django-celery>=3.0,<3.0.21
djangocelery3.1.X: django-celery>=3.1,<3.2
django1.4.X: django>=1.4,<1.5
django1.6.X: django>=1.6,<1.7
django1.7.X: django>=1.7,<1.8
django1.8.X: django>=1.8,<1.9
Expand Down