Skip to content

Commit

Permalink
Django version loosening
Browse files Browse the repository at this point in the history
This commit loosens the allowable version of django to anything
<1.9a0. Each of 1.8, 1.9, and 1.10 can now be tested using tox,
which will make the eventual upgrades much easier.
  • Loading branch information
Eric Fischer committed Feb 22, 2017
1 parent e4c4eae commit 07065d6
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 4 deletions.
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
language: python
python:
- "2.7"
env:
- TOXENV=django18
- TOXENV=django19
- TOXENV=django110
matrix:
allow_failures:
- env: TOXENV=django19
- env: TOXENV=django110
# Use docker for travis builds
sudo: false
install:
Expand All @@ -9,7 +17,6 @@ install:
- "python setup.py install"
- "pip install coveralls"
script:
- "python manage.py test"
- "python setup.py build_sphinx"
- "tox"
after_success:
coveralls
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include requirements.txt
include test-requirements.txt
include tox-requirements.txt
include LICENSE
include AUTHORS
include README.rst
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
dogapi==1.2.1
django>=1.8.14,<1.9
django-extensions==1.5.9
django-model-utils==2.3.1
# Use the same cherry-picked repo as edx-platform
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ def load_requirements(*requirements_paths):
'Programming Language :: Python',
],
packages=['submissions', 'submissions.migrations'],
install_requires=load_requirements('requirements.txt'),
install_requires=load_requirements('requirements.txt', 'tox-requirements.txt'),
tests_require=load_requirements('test-requirements.txt'),
)
3 changes: 3 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ git+https://github.com/edx/edx-lint.git@v0.4.1#egg=edx_lint==0.4.1
Sphinx==1.2
sphinx-rtd-theme==0.1.5
sphinxcontrib-napoleon==0.2.3

# Tox
tox==2.6.0
1 change: 1 addition & 0 deletions tox-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Django<1.11
13 changes: 13 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[tox]
envlist = django{18,19,110}

[testenv]
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
commands =
python manage.py test
python setup.py build_sphinx

0 comments on commit 07065d6

Please sign in to comment.