From 6ba7cc9d52408a7129a75d5e0c64cc34d05eaa95 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 29 Jun 2021 16:27:40 +0500 Subject: [PATCH 1/2] Due to pin inside django.in other packages gives conflicting errors. Moved the django pin into constraints.txt. --- .travis.yml | 1 + requirements/base.txt | 2 +- requirements/constraints.txt | 2 ++ requirements/dev.txt | 69 ++++++++++++++++++------------------ requirements/django-test.txt | 64 +++++++++++++++------------------ requirements/django.in | 2 -- requirements/django.txt | 10 +----- requirements/doc.txt | 59 +++++++++++++++--------------- requirements/pip-tools.txt | 7 ++-- requirements/test.txt | 49 +++++++++++++------------ requirements/travis.txt | 8 ++--- tox.ini | 3 +- 12 files changed, 132 insertions(+), 144 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f5ee90f..59e5e765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ env: - TOXENV=django22 - TOXENV=django30 - TOXENV=django31 + - TOXENV=django32 install: - pip install pip==20.0.2 - make requirements diff --git a/requirements/base.txt b/requirements/base.txt index af9edc51..3952a94a 100644 --- a/requirements/base.txt +++ b/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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 672ec1a5..aa6e8b3d 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,3 +15,5 @@ pytest<5.6.0 pytest-xdist<2.0.0 + +Django>=2.2,<3.0 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 3f5e29dd..07beea36 100644 --- a/requirements/dev.txt +++ b/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,14 +201,6 @@ 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 @@ -211,6 +208,16 @@ pyparsing==2.4.7 # -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 diff --git a/requirements/django-test.txt b/requirements/django-test.txt index 11dd2233..bdea76f7 100644 --- a/requirements/django-test.txt +++ b/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 diff --git a/requirements/django.in b/requirements/django.in index 73c9a0ab..422f633c 100644 --- a/requirements/django.in +++ b/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 diff --git a/requirements/django.txt b/requirements/django.txt index 539e30a7..5984c3e8 100644 --- a/requirements/django.txt +++ b/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 diff --git a/requirements/doc.txt b/requirements/doc.txt index dacb9408..deb811cc 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,15 +1,11 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # make upgrade # alabaster==0.7.12 # via sphinx -apipkg==1.5 - # via - # -r requirements/test.txt - # execnet astroid==2.5.6 # via # -r requirements/test.txt @@ -28,16 +24,16 @@ certifi==2021.5.30 # via requests chardet==4.0.0 # via requests -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 @@ -51,6 +47,7 @@ ddt==1.4.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/test.txt # edx-lint docutils==0.16 @@ -62,18 +59,18 @@ edx-lint==5.0.0 # via -r requirements/test.txt edx-sphinx-theme==2.1.0 # via -r requirements/doc.in -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 idna==2.10 # via requests imagesize==1.2.0 # via sphinx -isort==5.8.0 +isort==5.9.1 # via # -r requirements/test.txt # pylint @@ -129,6 +126,14 @@ pygments==2.9.0 # via # readme-renderer # sphinx +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 @@ -142,20 +147,22 @@ 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-forked + # pytest-pep8 + # pytest-pylint + # pytest-xdist pytest-cache==1.0 # via # -r requirements/test.txt @@ -174,16 +181,6 @@ 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-forked - # pytest-pep8 - # pytest-pylint - # pytest-xdist python-slugify==5.0.2 # via # -r requirements/test.txt @@ -249,7 +246,7 @@ toml==0.10.2 # pylint # pytest-cov # pytest-pylint -urllib3==1.26.5 +urllib3==1.26.6 # via requests wcwidth==0.2.5 # via diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 88f1620c..9f861d0f 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.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,13 @@ click==8.0.1 # via pip-tools pep517==0.10.0 # via pip-tools -pip-tools==6.1.0 +pip-tools==6.2.0 # via -r requirements/pip-tools.in toml==0.10.2 # via pep517 +wheel==0.36.2 + # via pip-tools # The following packages are considered to be unsafe in a requirements file: # pip +# setuptools diff --git a/requirements/test.txt b/requirements/test.txt index a3c1180d..e288baf5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,11 +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 execnet astroid==2.5.6 # via # pylint @@ -14,13 +12,13 @@ attrs==21.2.0 # via # hypothesis # pytest -click-log==0.3.2 - # via edx-lint click==8.0.1 # via # click-log # code-annotations # edx-lint +click-log==0.3.2 + # via edx-lint code-annotations==1.1.2 # via edx-lint coverage==5.5 @@ -32,16 +30,17 @@ ddt==1.4.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 # edx-lint edx-lint==5.0.0 # via -r requirements/test.in -execnet==1.8.1 +execnet==1.9.0 # via # pytest-cache # pytest-xdist -hypothesis==6.13.11 +hypothesis==6.14.0 # via -r requirements/test.in -isort==5.8.0 +isort==5.9.1 # via pylint jinja2==3.0.1 # via code-annotations @@ -71,6 +70,13 @@ py==1.10.0 # pytest-forked pycodestyle==2.7.0 # via -r requirements/test.in +pylint==2.8.3 + # via + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils + # pytest-pylint pylint-celery==0.3 # via edx-lint pylint-django==2.4.4 @@ -79,17 +85,20 @@ pylint-plugin-utils==0.6 # via # pylint-celery # pylint-django -pylint==2.8.3 - # via - # edx-lint - # pylint-celery - # pylint-django - # pylint-plugin-utils - # pytest-pylint pymongo==3.11.4 # via -r requirements/base.txt pyparsing==2.4.7 # via packaging +pytest==5.4.3 + # via + # -c requirements/constraints.txt + # -r requirements/test.in + # pytest-cache + # pytest-cov + # pytest-forked + # pytest-pep8 + # pytest-pylint + # pytest-xdist pytest-cache==1.0 # via pytest-pep8 pytest-cov==2.12.1 @@ -104,16 +113,6 @@ pytest-xdist==1.34.0 # via # -c requirements/constraints.txt # -r requirements/test.in -pytest==5.4.3 - # via - # -c requirements/constraints.txt - # -r requirements/test.in - # pytest-cache - # pytest-cov - # pytest-forked - # pytest-pep8 - # pytest-pylint - # pytest-xdist python-slugify==5.0.2 # via code-annotations pytz==2021.1 diff --git a/requirements/travis.txt b/requirements/travis.txt index d8c8ff36..440b2119 100644 --- a/requirements/travis.txt +++ b/requirements/travis.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 @@ -40,13 +40,13 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox-battery==0.6.1 - # via -r requirements/travis.in tox==3.23.1 # via # -r requirements/travis.in # tox-battery -urllib3==1.26.5 +tox-battery==0.6.1 + # via -r requirements/travis.in +urllib3==1.26.6 # via requests virtualenv==20.4.7 # via tox diff --git a/tox.ini b/tox.ini index 670b77b4..f8a1818e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{22,30,31},quality,without-django +envlist = py38-django{22,30,31,32},quality,without-django skip_missing_interpreters = True [testenv] @@ -7,6 +7,7 @@ deps = django22: Django>=2.2,<2.3 django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 + django32: Django>=3.2,<3.3 -r{toxinidir}/requirements/django-test.txt commands = pytest --disable-pytest-warnings --nomigrations {posargs} From ab46b2cafec057dde41be6a3b9c99772d9f6b7d7 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 29 Jun 2021 16:29:20 +0500 Subject: [PATCH 2/2] Due to pin inside django.in other packages gives conflicting errors. Moved the django pin into constraints.txt. --- CHANGELOG.rst | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 622b94ef..5dcbf3d0 100644 --- a/CHANGELOG.rst +++ b/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 diff --git a/setup.py b/setup.py index b21013ea..133df678 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def is_requirement(line): setup( name='edx-opaque-keys', - version='2.2.1', + version='2.2.2', author='edX', url='https://github.com/edx/opaque-keys', classifiers=[