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.

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

removed django-celery requirement #34

Merged
merged 4 commits into from
Jan 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ matrix:
- python: "2.7"
env: TOXENV=py27-django-110
- python: "2.7"
env: TOXENV=py27-django-111-fix

- python: "3.3"
env: TOXENV=py33-django-17
- python: "3.3"
env: TOXENV=py33-django-18
env: TOXENV=py27-django-111

- python: "3.4"
env: TOXENV=py34-django-17
Expand All @@ -30,7 +25,7 @@ matrix:
- python: "3.4"
env: TOXENV=py34-django-110
- python: "3.4"
env: TOXENV=py34-django-111-fix
env: TOXENV=py34-django-111

- python: "3.5"
env: TOXENV=py35-django-18
Expand All @@ -39,7 +34,7 @@ matrix:
- python: "3.5"
env: TOXENV=py35-django-110
- python: "3.5"
env: TOXENV=py35-django-111-fix
env: TOXENV=py35-django-111
- python: "3.5"
env: TOXENV=py35-django-dev

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def read(*parts):
],
install_requires=[
'six>=1.10.0',
'django-celery>=3.1',
'django-appconf >= 0.4',
'packaging==16.8',
],
Expand Down
1 change: 0 additions & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ coverage
celery
SQLAlchemy
anyjson
pytest-django
pytest-cov
pytest-sugar
pytest-assume
Expand Down
1 change: 0 additions & 1 deletion tests/test_storages.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ def test_transfer_retried(self):
obj.testfile.save(self.test_file_name, File(self.test_file))
obj.save()

self.assertFalse(obj.testfile.storage.result.get())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this removed?

self.assertTrue(models.TestModel.retried)

def test_delayed_storage(self):
Expand Down
12 changes: 5 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ downloadcache = {distshare}
args_are_paths = false
envlist =
{py35,py36}-django-dev
{py27,py34,py35}-django-111-fix
{py27,py34,py35}-django-111
{py27,py34,py35}-django-{19,110}
{py27,py33,py34,py35}-django-18
{py27,py33,py34}-django-17
{py27,py34,py35}-django-18
{py27,py34}-django-17
# flake8

[testenv]
basepython =
py27: python2.7
py33: python3.3
py34: python3.4
py35: python3.5
py36: python3.6
Expand All @@ -22,19 +21,18 @@ setenv =
commands = {posargs:py.test}
deps =
django-17: Django>=1.7,<1.8
django-17: pytest-django>3,<=3.1.0
django-18: Django>=1.8,<1.9
django-19: Django>=1.9,<1.10
django-110: Django>=1.10,<1.11
django-111: Django>=1.11,<1.12
django-dev: git+https://github.com/django/django.git#egg=Django
fix: git+https://github.com/pytest-dev/pytest-django.git#egg=pytest_django
py33: django-celery>=3.1,<3.2
django-{18,19,110,111,dev}: pytest-django>=3.2.0
-rtests/requirements.txt

[travis]
python =
2.7: py27
3.3: py33
3.4: py34
3.5: py35
3.6: py36
Expand Down