diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4473363..bdc7a33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [django22-drf39, django22-drflatest, quality, docs] + toxenv: [django22-drf39, django22-drflatest, quality, docs, django30-drflatest, django31-drflatest] steps: - uses: actions/checkout@v1 - name: setup python diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6bcf2ca..271f2a6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,9 @@ Change Log Unreleased ~~~~~~~~~~ +[2.1.2] - 2021-06-24 +~~~~~~~~~~~~~~~~~~~~ +* Move out django pin from base.in. Now it is coming from global constraint. Ran make upgrade. [2.1.1] - 2021-01-28 ~~~~~~~~~~~~~~~~~~~~ diff --git a/config_models/__init__.py b/config_models/__init__.py index 2abe41e..cc4f5bf 100644 --- a/config_models/__init__.py +++ b/config_models/__init__.py @@ -2,6 +2,6 @@ Configuration models for Django allowing config management with auditing. """ -__version__ = '2.1.1' +__version__ = '2.1.2' default_app_config = 'config_models.apps.ConfigModelsConfig' # pylint: disable=invalid-name diff --git a/requirements/base.in b/requirements/base.in index d18c2cf..3590e8a 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,6 +1,6 @@ # Core requirements for using this application -c constraints.txt -Django>=1.8,<3 # Web application framework +Django # Web application framework djangorestframework>=3.6 edx-django-utils diff --git a/requirements/base.txt b/requirements/base.txt index e893334..9be9851 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,17 +1,17 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # make upgrade # -django-waffle==2.2.0 - # via edx-django-utils django==2.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # djangorestframework # edx-django-utils +django-waffle==2.2.0 + # via edx-django-utils djangorestframework==3.12.4 # via -r requirements/base.in edx-django-utils==2.0.4 diff --git a/requirements/ci.txt b/requirements/ci.txt index 32f22ed..b743247 100644 --- a/requirements/ci.txt +++ b/requirements/ci.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 @@ -38,15 +38,15 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox-battery==0.6.1 - # via -r requirements/ci.in -tox-travis==0.12 - # via -r requirements/ci.in tox==3.23.1 # via # -r requirements/ci.in # tox-battery # tox-travis +tox-battery==0.6.1 + # via -r requirements/ci.in +tox-travis==0.12 + # via -r requirements/ci.in urllib3==1.26.6 # via requests virtualenv==20.4.7 diff --git a/requirements/dev.txt b/requirements/dev.txt index d2e4b39..76d49fe 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 @@ -25,10 +25,6 @@ chardet==4.0.0 # via # -r requirements/ci.txt # requests -click-log==0.3.2 - # via - # -r requirements/quality.txt - # edx-lint click==8.0.1 # via # -r requirements/pip-tools.txt @@ -37,6 +33,10 @@ click==8.0.1 # code-annotations # edx-lint # pip-tools +click-log==0.3.2 + # via + # -r requirements/quality.txt + # edx-lint code-annotations==1.1.2 # via # -r requirements/quality.txt @@ -55,10 +55,6 @@ distlib==0.3.2 # via # -r requirements/ci.txt # virtualenv -django-waffle==2.2.0 - # via - # -r requirements/quality.txt - # edx-django-utils django==2.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -67,6 +63,10 @@ django==2.2.24 # edx-django-utils # edx-i18n-tools # edx-lint +django-waffle==2.2.0 + # via + # -r requirements/quality.txt + # edx-django-utils djangorestframework==3.12.4 # via -r requirements/quality.txt edx-django-utils==2.0.4 @@ -122,10 +122,10 @@ packaging==20.9 # -r requirements/quality.txt # pytest # tox -path.py==12.5.0 - # via edx-i18n-tools path==16.0.0 # via path.py +path.py==12.5.0 + # via edx-i18n-tools pbr==5.6.0 # via # -r requirements/quality.txt @@ -158,6 +158,13 @@ pycodestyle==2.7.0 # via -r requirements/quality.txt pydocstyle==6.1.1 # via -r requirements/quality.txt +pylint==2.8.3 + # via + # -r requirements/quality.txt + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils pylint-celery==0.3 # via # -r requirements/quality.txt @@ -171,27 +178,20 @@ pylint-plugin-utils==0.6 # -r requirements/quality.txt # pylint-celery # pylint-django -pylint==2.8.3 - # via - # -r requirements/quality.txt - # edx-lint - # pylint-celery - # pylint-django - # pylint-plugin-utils pyparsing==2.4.7 # via # -r requirements/ci.txt # -r requirements/quality.txt # packaging -pytest-cov==2.12.1 - # via -r requirements/quality.txt -pytest-django==4.4.0 - # via -r requirements/quality.txt pytest==6.2.4 # via # -r requirements/quality.txt # pytest-cov # pytest-django +pytest-cov==2.12.1 + # via -r requirements/quality.txt +pytest-django==4.4.0 + # via -r requirements/quality.txt python-dateutil==2.8.1 # via # -r requirements/quality.txt @@ -248,15 +248,15 @@ toml==0.10.2 # pytest # pytest-cov # tox -tox-battery==0.6.1 - # via -r requirements/ci.txt -tox-travis==0.12 - # via -r requirements/ci.txt tox==3.23.1 # via # -r requirements/ci.txt # tox-battery # tox-travis +tox-battery==0.6.1 + # via -r requirements/ci.txt +tox-travis==0.12 + # via -r requirements/ci.txt urllib3==1.26.6 # via # -r requirements/ci.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 50d3216..38d333d 100644 --- a/requirements/doc.txt +++ b/requirements/doc.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 @@ -16,8 +16,6 @@ bleach==3.3.0 # via readme-renderer certifi==2021.5.30 # via requests -cffi==1.14.5 - # via cryptography chardet==4.0.0 # via requests colorama==0.4.4 @@ -26,20 +24,18 @@ coverage==5.5 # via # -r requirements/test.txt # pytest-cov -cryptography==3.4.7 - # via secretstorage ddt==1.4.2 # via -r requirements/test.txt -django-waffle==2.2.0 - # via - # -r requirements/test.txt - # edx-django-utils django==2.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # djangorestframework # edx-django-utils +django-waffle==2.2.0 + # via + # -r requirements/test.txt + # edx-django-utils djangorestframework==3.12.4 # via -r requirements/test.txt docutils==0.16 @@ -66,10 +62,6 @@ iniconfig==1.1.1 # via # -r requirements/test.txt # pytest -jeepney==0.6.0 - # via - # keyring - # secretstorage jinja2==3.0.1 # via sphinx keyring==23.0.1 @@ -100,8 +92,6 @@ py==1.10.0 # via # -r requirements/test.txt # pytest -pycparser==2.20 - # via cffi pygments==2.9.0 # via # readme-renderer @@ -110,15 +100,15 @@ pyparsing==2.4.7 # via # -r requirements/test.txt # packaging -pytest-cov==2.12.1 - # via -r requirements/test.txt -pytest-django==4.4.0 - # via -r requirements/test.txt pytest==6.2.4 # via # -r requirements/test.txt # pytest-cov # pytest-django +pytest-cov==2.12.1 + # via -r requirements/test.txt +pytest-django==4.4.0 + # via -r requirements/test.txt python-dateutil==2.8.1 # via # -r requirements/test.txt @@ -132,17 +122,15 @@ readme-renderer==29.0 # via # -r requirements/doc.in # twine -requests-toolbelt==0.9.1 - # via twine requests==2.25.1 # via # requests-toolbelt # sphinx # twine +requests-toolbelt==0.9.1 + # via twine rfc3986==1.5.0 # via twine -secretstorage==3.3.1 - # via keyring six==1.16.0 # via # -r requirements/test.txt @@ -151,12 +139,12 @@ six==1.16.0 # readme-renderer snowballstemmer==2.1.0 # via sphinx -sphinx-rtd-theme==0.5.2 - # via -r requirements/doc.in sphinx==4.0.2 # via # -r requirements/doc.in # sphinx-rtd-theme +sphinx-rtd-theme==0.5.2 + # via -r requirements/doc.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index a365521..9f861d0 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 diff --git a/requirements/pip.txt b/requirements/pip.txt index 081b6c8..6c1ec1b 100644 --- a/requirements/pip.txt +++ b/requirements/pip.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/quality.txt b/requirements/quality.txt index baa479e..9ffa62a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.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 @@ -12,13 +12,13 @@ attrs==21.2.0 # via # -r requirements/test.txt # 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 @@ -27,10 +27,6 @@ coverage==5.5 # pytest-cov ddt==1.4.2 # via -r requirements/test.txt -django-waffle==2.2.0 - # via - # -r requirements/test.txt - # edx-django-utils django==2.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -38,6 +34,10 @@ django==2.2.24 # djangorestframework # edx-django-utils # edx-lint +django-waffle==2.2.0 + # via + # -r requirements/test.txt + # edx-django-utils djangorestframework==3.12.4 # via -r requirements/test.txt edx-django-utils==2.0.4 @@ -88,6 +88,12 @@ pycodestyle==2.7.0 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in +pylint==2.8.3 + # via + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils pylint-celery==0.3 # via edx-lint pylint-django==2.4.4 @@ -96,25 +102,19 @@ pylint-plugin-utils==0.6 # via # pylint-celery # pylint-django -pylint==2.8.3 - # via - # edx-lint - # pylint-celery - # pylint-django - # pylint-plugin-utils pyparsing==2.4.7 # via # -r requirements/test.txt # packaging -pytest-cov==2.12.1 - # via -r requirements/test.txt -pytest-django==4.4.0 - # via -r requirements/test.txt pytest==6.2.4 # via # -r requirements/test.txt # pytest-cov # pytest-django +pytest-cov==2.12.1 + # via -r requirements/test.txt +pytest-django==4.4.0 + # via -r requirements/test.txt python-dateutil==2.8.1 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index ff06dcc..9d31b88 100644 --- a/requirements/test.txt +++ b/requirements/test.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 @@ -10,14 +10,14 @@ coverage==5.5 # via pytest-cov ddt==1.4.2 # via -r requirements/test.in -django-waffle==2.2.0 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt + # djangorestframework # edx-django-utils +django-waffle==2.2.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt - # djangorestframework # edx-django-utils # via -r requirements/base.txt edx-django-utils==2.0.4 @@ -44,14 +44,14 @@ py==1.10.0 # via pytest pyparsing==2.4.7 # via packaging -pytest-cov==2.12.1 - # via -r requirements/test.in -pytest-django==4.4.0 - # via -r requirements/test.in pytest==6.2.4 # via # pytest-cov # pytest-django +pytest-cov==2.12.1 + # via -r requirements/test.in +pytest-django==4.4.0 + # via -r requirements/test.in python-dateutil==2.8.1 # via freezegun pytz==2021.1