Merge pull request #188 from edx/moving-djangopin

Due to pin inside django.in other packages gives conflicting errors. …

.travis.yml

@@ -7,6 +7,7 @@ env:
   - TOXENV=django22
   - TOXENV=django30
   - TOXENV=django31
+  - TOXENV=django32
 install:
   - pip install pip==20.0.2
   - make requirements

CHANGELOG.rst

@@ -1,3 +1,7 @@
+# 2.2.2
+
+* Moved django pin from django.in to constraint.txt. Upgraded dependencies
+
 # 2.2.1
 
 * Upgraded dependencies

requirements/base.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    make upgrade

requirements/constraints.txt

@@ -15,3 +15,5 @@
 pytest<5.6.0
 
 pytest-xdist<2.0.0
+
+Django>=2.2,<3.0

requirements/dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    make upgrade
@@ -8,10 +8,6 @@ alabaster==0.7.12
     # via
     #   -r requirements/doc.txt
     #   sphinx
-apipkg==1.5
-    # via
-    #   -r requirements/doc.txt
-    #   execnet
 appdirs==1.4.4
     # via
     #   -r requirements/travis.txt
@@ -44,10 +40,6 @@ chardet==4.0.0
     #   -r requirements/doc.txt
     #   -r requirements/travis.txt
     #   requests
-click-log==0.3.2
-    # via
-    #   -r requirements/doc.txt
-    #   edx-lint
 click==8.0.1
     # via
     #   -r requirements/doc.txt
@@ -56,6 +48,10 @@ click==8.0.1
     #   code-annotations
     #   edx-lint
     #   pip-tools
+click-log==0.3.2
+    # via
+    #   -r requirements/doc.txt
+    #   edx-lint
 code-annotations==1.1.2
     # via
     #   -r requirements/doc.txt
@@ -77,6 +73,7 @@ distlib==0.3.2
 django==2.2.24
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/doc.txt
     #   edx-lint
 docopt==0.6.2
@@ -93,7 +90,7 @@ edx-lint==5.0.0
     # via -r requirements/doc.txt
 edx-sphinx-theme==2.1.0
     # via -r requirements/doc.txt
-execnet==1.8.1
+execnet==1.9.0
     # via
     #   -r requirements/doc.txt
     #   pytest-cache
@@ -103,7 +100,7 @@ filelock==3.0.12
     #   -r requirements/travis.txt
     #   tox
     #   virtualenv
-hypothesis==6.13.11
+hypothesis==6.14.0
     # via -r requirements/doc.txt
 idna==2.10
     # via
@@ -114,7 +111,7 @@ imagesize==1.2.0
     # via
     #   -r requirements/doc.txt
     #   sphinx
-isort==5.8.0
+isort==5.9.1
     # via
     #   -r requirements/doc.txt
     #   pylint
@@ -161,7 +158,7 @@ pep8==1.7.1
     # via
     #   -r requirements/doc.txt
     #   pytest-pep8
-pip-tools==6.1.0
+pip-tools==6.2.0
     # via -r requirements/pip-tools.txt
 pluggy==0.13.1
     # via
@@ -183,6 +180,14 @@ pygments==2.9.0
     #   -r requirements/doc.txt
     #   readme-renderer
     #   sphinx
+pylint==2.8.3
+    # via
+    #   -r requirements/doc.txt
+    #   edx-lint
+    #   pylint-celery
+    #   pylint-django
+    #   pylint-plugin-utils
+    #   pytest-pylint
 pylint-celery==0.3
     # via
     #   -r requirements/doc.txt
@@ -196,21 +201,23 @@ pylint-plugin-utils==0.6
     #   -r requirements/doc.txt
     #   pylint-celery
     #   pylint-django
-pylint==2.8.3
-    # via
-    #   -r requirements/doc.txt
-    #   edx-lint
-    #   pylint-celery
-    #   pylint-django
-    #   pylint-plugin-utils
-    #   pytest-pylint
 pymongo==3.11.4
     # via -r requirements/doc.txt
 pyparsing==2.4.7
     # via
     #   -r requirements/doc.txt
     #   -r requirements/travis.txt
     #   packaging
+pytest==5.4.3
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/doc.txt
+    #   pytest-cache
+    #   pytest-cov
+    #   pytest-forked
+    #   pytest-pep8
+    #   pytest-pylint
+    #   pytest-xdist
 pytest-cache==1.0
     # via
     #   -r requirements/doc.txt
@@ -229,16 +236,6 @@ pytest-xdist==1.34.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/doc.txt
-pytest==5.4.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/doc.txt
-    #   pytest-cache
-    #   pytest-cov
-    #   pytest-forked
-    #   pytest-pep8
-    #   pytest-pylint
-    #   pytest-xdist
 python-slugify==5.0.2
     # via
     #   -r requirements/doc.txt
@@ -329,13 +326,13 @@ toml==0.10.2
     #   pytest-cov
     #   pytest-pylint
     #   tox
-tox-battery==0.6.1
-    # via -r requirements/travis.txt
 tox==3.23.1
     # via
     #   -r requirements/travis.txt
     #   tox-battery
-urllib3==1.26.5
+tox-battery==0.6.1
+    # via -r requirements/travis.txt
+urllib3==1.26.6
     # via
     #   -r requirements/doc.txt
     #   -r requirements/travis.txt
@@ -352,6 +349,10 @@ webencodings==0.5.1
     # via
     #   -r requirements/doc.txt
     #   bleach
+wheel==0.36.2
+    # via
+    #   -r requirements/pip-tools.txt
+    #   pip-tools
 wrapt==1.12.1
     # via
     #   -r requirements/doc.txt

requirements/django-test.txt

@@ -1,13 +1,9 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    make upgrade
 #
-apipkg==1.5
-    # via
-    #   -r requirements/test.txt
-    #   execnet
 astroid==2.5.6
     # via
     #   -r requirements/test.txt
@@ -18,16 +14,16 @@ attrs==21.2.0
     #   -r requirements/test.txt
     #   hypothesis
     #   pytest
-click-log==0.3.2
-    # via
-    #   -r requirements/test.txt
-    #   edx-lint
 click==8.0.1
     # via
     #   -r requirements/test.txt
     #   click-log
     #   code-annotations
     #   edx-lint
+click-log==0.3.2
+    # via
+    #   -r requirements/test.txt
+    #   edx-lint
 code-annotations==1.1.2
     # via
     #   -r requirements/test.txt
@@ -40,19 +36,19 @@ ddt==1.4.2
     # via -r requirements/test.txt
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   -r requirements/django.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   edx-lint
 edx-lint==5.0.0
     # via -r requirements/test.txt
-execnet==1.8.1
+execnet==1.9.0
     # via
     #   -r requirements/test.txt
     #   pytest-cache
     #   pytest-xdist
-hypothesis==6.13.11
+hypothesis==6.14.0
     # via -r requirements/test.txt
-isort==5.8.0
+isort==5.9.1
     # via
     #   -r requirements/test.txt
     #   pylint
@@ -101,6 +97,14 @@ py==1.10.0
     #   pytest-forked
 pycodestyle==2.7.0
     # via -r requirements/test.txt
+pylint==2.8.3
+    # via
+    #   -r requirements/test.txt
+    #   edx-lint
+    #   pylint-celery
+    #   pylint-django
+    #   pylint-plugin-utils
+    #   pytest-pylint
 pylint-celery==0.3
     # via
     #   -r requirements/test.txt
@@ -114,27 +118,30 @@ pylint-plugin-utils==0.6
     #   -r requirements/test.txt
     #   pylint-celery
     #   pylint-django
-pylint==2.8.3
-    # via
-    #   -r requirements/test.txt
-    #   edx-lint
-    #   pylint-celery
-    #   pylint-django
-    #   pylint-plugin-utils
-    #   pytest-pylint
 pymongo==3.11.4
     # via -r requirements/test.txt
 pyparsing==2.4.7
     # via
     #   -r requirements/test.txt
     #   packaging
+pytest==5.4.3
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/test.txt
+    #   pytest-cache
+    #   pytest-cov
+    #   pytest-django
+    #   pytest-forked
+    #   pytest-pep8
+    #   pytest-pylint
+    #   pytest-xdist
 pytest-cache==1.0
     # via
     #   -r requirements/test.txt
     #   pytest-pep8
 pytest-cov==2.12.1
     # via -r requirements/test.txt
-pytest-django==4.3.0
+pytest-django==4.4.0
     # via -r requirements/django-test.in
 pytest-forked==1.3.0
     # via
@@ -148,24 +155,12 @@ pytest-xdist==1.34.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
-pytest==5.4.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.txt
-    #   pytest-cache
-    #   pytest-cov
-    #   pytest-django
-    #   pytest-forked
-    #   pytest-pep8
-    #   pytest-pylint
-    #   pytest-xdist
 python-slugify==5.0.2
     # via
     #   -r requirements/test.txt
     #   code-annotations
 pytz==2021.1
     # via
-    #   -r requirements/django.txt
     #   -r requirements/test.txt
     #   django
 pyyaml==5.4.1
@@ -183,7 +178,6 @@ sortedcontainers==2.4.0
     #   hypothesis
 sqlparse==0.4.1
     # via
-    #   -r requirements/django.txt
     #   -r requirements/test.txt
     #   django
 stevedore==3.3.0

requirements/django.in

@@ -4,5 +4,3 @@
 # Match resolved versions of core dependencies (doesn't actually pull them in)
 -c base.txt
 
-
-Django>=2.2,<3.0

requirements/django.txt

@@ -1,14 +1,6 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    make upgrade
 #
-django==2.2.24
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   -r requirements/django.in
-pytz==2021.1
-    # via django
-sqlparse==0.4.1
-    # via django