Skip to content

Commit

Permalink
Merge pull request #25 from edx/christina/django-upgrade
Browse files Browse the repository at this point in the history
Support django 1.11.
  • Loading branch information
Christina Roberts authored Jul 10, 2017
2 parents e27decb + 0d18d60 commit f1a951d
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 33 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ reports/
coverage/
htmlcov/
acceptance_tests/*.png
.tox/

11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
language: python
python: "2.7"
python:
- 2.7
env:
- TOXENV=django18
- TOXENV=django111
matrix:
include:
- python: 2.7
env: TOXENV=quality
before_install:
- export DJANGO_SETTINGS_MODULE=settings
install:
- "make install"
sudo: false
script:
- make quality
- make test
branches:
only:
Expand Down
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Matt Drayer <[email protected]>
Zia Fazal <[email protected]>
Douglas Hall <[email protected]>
Christina Roberts <[email protected]>

7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ install-test:
pip install -q -r test_requirements.txt

install: install-test
pip install -q -r requirements.txt

quality:
./bin/quality.sh
tox -e quality

test:
./bin/test.sh
test: ## run tests on every supported Python version
tox
5 changes: 0 additions & 5 deletions bin/quality.sh

This file was deleted.

17 changes: 0 additions & 17 deletions bin/test.sh

This file was deleted.

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Django/Framework Packages
django>=1.8,<1.9
django>=1.8,<2.0
django-model-utils

# edX Packages
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name='edx-milestones',
version='0.1.10',
version='0.1.11',
description='Significant events module for Open edX',
long_description=open('README.md').read(),
author='edX',
Expand All @@ -21,7 +21,7 @@
],
packages=find_packages(exclude=["tests"]),
install_requires=[
"django>=1.8,<1.9",
"django>=1.8,<2.0",
"django-model-utils",
"edx-opaque-keys>=0.2.1,<1.0.0",
],
Expand Down
5 changes: 2 additions & 3 deletions test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
-r requirements.txt

astroid==1.3.8 # Pinning to avoid backwards incompatibility issue with pylint/pylint-django
coveralls
coverage==3.7.1
django_nose==1.4.1
django_nose>=1.4.1
nose==1.3.3
httpretty==0.8.0
pep8==1.5.7
Expand All @@ -12,3 +10,4 @@ pep257==0.3.2
mock==1.0.1
testfixtures==4.0.0
ddt==0.8.0
tox>=2.3.1,<3.0.0
22 changes: 22 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[tox]
envlist = py27-django{18,111}

[testenv]
setenv =
DJANGO_SETTINGS_MODULE = settings
PYTHONPATH = {toxinidir}

deps =
django18: Django>=1.8,<1.9
django111: Django>=1.11,<2.0
-rtest_requirements.txt

commands =
coverage run manage.py test --verbosity=3
coverage report -m
coverage html

[testenv:quality]
commands =
pep8 --config=.pep8 milestones
pylint --rcfile=.pylintrc milestones

0 comments on commit f1a951d

Please sign in to comment.