Commit 1efd6502 by Brian Mesick Committed by GitHub

Merge pull request #71 from edx/bmedx/upgrade_django-model-utils

Loosen django-model-utils version, make tox Py version explicit
parents 5ad00f0e 5b80e90b
dogapi>=1.2.1,<2.0.0 dogapi>=1.2.1,<2.0.0
django-model-utils>=2.3.1,<3.0.0 django-model-utils>=2.3.1
# Use the same DRF version as edx-platform # Use the same DRF version as edx-platform
git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3 git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
jsonfield>=2.0.2,<3.0.0 jsonfield>=2.0.2,<3.0.0
......
#!/usr/bin/env python #!/usr/bin/env python
from setuptools import setup from setuptools import setup
from submissions import __version__ as VERSION
def is_requirement(line): def is_requirement(line):
""" """
...@@ -33,7 +34,7 @@ def load_requirements(*requirements_paths): ...@@ -33,7 +34,7 @@ def load_requirements(*requirements_paths):
setup( setup(
name='edx-submissions', name='edx-submissions',
version='2.0.11', version=VERSION,
author='edX', author='edX',
description='An API for creating submissions and scores.', description='An API for creating submissions and scores.',
url='http://github.com/edx/edx-submissions.git', url='http://github.com/edx/edx-submissions.git',
......
__version__ = u'2.0.0' __version__ = u'2.0.12'
[tox] [tox]
envlist = django{18,110,111} envlist = py27-django{18,110,111}
[testenv] [testenv]
deps = deps =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment