From d335bb356af26ed0dc380e6a553a63d1f9b79f0c Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com> Date: Fri, 9 Jul 2021 11:40:22 +0500 Subject: [PATCH] feat: remove django upper constraint (#103) * feat: remove django upper constraint * chore: bump version for release --- CHANGELOG.rst | 5 +++ edx_ace/__init__.py | 2 +- edx_ace/message.py | 2 +- requirements/base.in | 2 +- requirements/dev.txt | 89 ++++++++++++++++++++++------------------ requirements/doc.txt | 52 ++++++++++++----------- requirements/quality.txt | 37 ++++++++--------- requirements/test.txt | 46 +++++++++++++-------- requirements/travis.txt | 16 ++++---- 9 files changed, 139 insertions(+), 112 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 92869f90..2cdc182f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,11 @@ Change Log Unreleased ~~~~~~~~~~ +[1.1.1] - 2021-07-09 +~~~~~~~~~~~~~~~~~~~~ + +* Removed upper constraint from Django + [1.1.0] - 2021-03-26 ~~~~~~~~~~~~~~~~~~~~ diff --git a/edx_ace/__init__.py b/edx_ace/__init__.py index 6054bbde..013c3770 100644 --- a/edx_ace/__init__.py +++ b/edx_ace/__init__.py @@ -13,7 +13,7 @@ from .recipient import Recipient from .recipient_resolver import RecipientResolver -__version__ = '1.1.0' +__version__ = '1.1.1' default_app_config = 'edx_ace.apps.EdxAceConfig' diff --git a/edx_ace/message.py b/edx_ace/message.py index d9069a1a..61dbbb83 100644 --- a/edx_ace/message.py +++ b/edx_ace/message.py @@ -10,10 +10,10 @@ from django.apps import apps -import edx_ace.utils.date as date from edx_ace.monitoring import report as monitoring_report from edx_ace.recipient import Recipient from edx_ace.serialization import MessageAttributeSerializationMixin +from edx_ace.utils import date @attr.s diff --git a/requirements/base.in b/requirements/base.in index c9486eaa..e15b53b9 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,7 +1,7 @@ # Core requirements for using this application -c constraints.txt -Django>=2.2,<2.3 # Web application framework +Django>=2.2 # Web application framework python-dateutil # Python Date Utilities attrs>=17.2.0 # Attributes without boilerplate sailthru-client==2.2.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index c065f627..052b2a95 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,15 +6,15 @@ # appdirs==1.4.4 # via virtualenv -astroid==2.4.2 +astroid==2.6.2 # via # pylint # pylint-celery -attrs==20.3.0 +attrs==21.2.0 # via -r requirements/base.in -bleach==3.2.3 +bleach==3.3.0 # via readme-renderer -certifi==2020.12.5 +certifi==2021.5.30 # via requests chardet==4.0.0 # via @@ -22,32 +22,31 @@ chardet==4.0.0 # requests click-log==0.3.2 # via edx-lint -click==7.1.2 +click==8.0.1 # via # click-log # code-annotations # edx-lint # pip-tools -code-annotations==1.0.2 +code-annotations==1.1.2 # via edx-lint colorama==0.4.4 # via twine -diff-cover==4.2.0 +diff-cover==6.0.0 # via -r requirements/dev.in -distlib==0.3.1 +distlib==0.3.2 # via virtualenv -django==2.2.17 +django==2.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in - # code-annotations # edx-i18n-tools # edx-lint -docutils==0.16 +docutils==0.17.1 # via readme-renderer edx-i18n-tools==0.5.3 # via -r requirements/dev.in -edx-lint==3.0.2 +edx-lint==5.0.0 # via # -r requirements/dev.in # -r requirements/quality.in @@ -57,38 +56,44 @@ filelock==3.0.12 # virtualenv idna==2.10 # via requests -inflect==5.0.2 +importlib-metadata==4.6.1 + # via + # keyring + # twine +inflect==5.3.0 # via jinja2-pluralize -isort==5.7.0 +isort==5.9.2 # via # -r requirements/quality.in # pylint jinja2-pluralize==0.3.0 # via diff-cover -jinja2==2.11.2 +jinja2==3.0.1 # via # code-annotations # diff-cover # jinja2-pluralize -keyring==22.0.1 +keyring==23.0.1 # via twine -lazy-object-proxy==1.4.3 +lazy-object-proxy==1.6.0 # via astroid -markupsafe==1.1.1 +markupsafe==2.0.1 # via jinja2 mccabe==0.6.1 # via pylint -packaging==20.8 +packaging==21.0 # via # bleach # tox path.py==12.5.0 # via edx-i18n-tools -path==15.0.1 +path==16.0.0 # via path.py -pbr==5.5.1 +pbr==5.6.0 # via stevedore -pip-tools==5.5.0 +pep517==0.10.0 + # via pip-tools +pip-tools==6.2.0 # via -r requirements/dev.in pkginfo==1.7.0 # via twine @@ -96,27 +101,27 @@ pluggy==0.13.1 # via # diff-cover # tox -polib==1.1.0 +polib==1.1.1 # via edx-i18n-tools py==1.10.0 # via tox -pycodestyle==2.6.0 +pycodestyle==2.7.0 # via -r requirements/quality.in -pydocstyle==5.1.1 +pydocstyle==6.1.1 # via -r requirements/quality.in -pygments==2.7.4 +pygments==2.9.0 # via # diff-cover # readme-renderer pylint-celery==0.3 # via edx-lint -pylint-django==2.4.2 +pylint-django==2.4.4 # via edx-lint pylint-plugin-utils==0.6 # via # pylint-celery # pylint-django -pylint==2.6.0 +pylint==2.9.3 # via # edx-lint # pylint-celery @@ -126,15 +131,15 @@ pyparsing==2.4.7 # via packaging python-dateutil==2.8.1 # via -r requirements/base.in -python-slugify==4.0.1 +python-slugify==5.0.2 # via code-annotations -pytz==2020.5 +pytz==2021.1 # via django pyyaml==5.4.1 # via # code-annotations # edx-i18n-tools -readme-renderer==28.0 +readme-renderer==29.0 # via twine requests-toolbelt==0.9.1 # via twine @@ -143,16 +148,15 @@ requests==2.25.1 # requests-toolbelt # sailthru-client # twine -rfc3986==1.4.0 +rfc3986==1.5.0 # via twine sailthru-client==2.2.3 # via -r requirements/base.in simplejson==3.17.2 # via sailthru-client -six==1.15.0 +six==1.16.0 # via # -r requirements/base.in - # astroid # bleach # edx-i18n-tools # edx-lint @@ -172,24 +176,29 @@ text-unidecode==1.3 # via python-slugify toml==0.10.2 # via + # pep517 # pylint # tox -tox==3.21.3 +tox==3.23.1 # via -r requirements/dev.in -tqdm==4.56.0 +tqdm==4.61.2 # via twine -twine==3.3.0 +twine==3.4.1 # via -r requirements/dev.in -urllib3==1.26.3 +urllib3==1.26.6 # via requests -virtualenv==20.4.0 +virtualenv==20.4.7 # via tox webencodings==0.5.1 # via bleach wheel==0.36.2 - # via -r requirements/dev.in + # via + # -r requirements/dev.in + # pip-tools wrapt==1.12.1 # via astroid +zipp==3.5.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index d8cd3671..bd4e50b5 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -6,13 +6,13 @@ # alabaster==0.7.12 # via sphinx -attrs==20.3.0 +attrs==21.2.0 # via -r requirements/base.in -babel==2.9.0 +babel==2.9.1 # via sphinx -bleach==3.2.3 +bleach==3.3.0 # via readme-renderer -certifi==2020.12.5 +certifi==2021.5.30 # via requests chardet==4.0.0 # via @@ -20,39 +20,43 @@ chardet==4.0.0 # requests colorama==0.4.4 # via twine -django==2.2.17 +django==2.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in doc8==0.8.1 # via -r requirements/doc.in -docutils==0.16 +docutils==0.17.1 # via # doc8 # readme-renderer # restructuredtext-lint # sphinx -edx-sphinx-theme==1.6.1 +edx-sphinx-theme==3.0.0 # via -r requirements/doc.in idna==2.10 # via requests imagesize==1.2.0 # via sphinx -jinja2==2.11.2 +importlib-metadata==4.6.1 + # via + # keyring + # twine +jinja2==3.0.1 # via sphinx -keyring==22.0.1 +keyring==23.0.1 # via twine -markupsafe==1.1.1 +markupsafe==2.0.1 # via jinja2 -packaging==20.8 +packaging==21.0 # via # bleach # sphinx -pbr==5.5.1 +pbr==5.6.0 # via stevedore pkginfo==1.7.0 # via twine -pygments==2.7.4 +pygments==2.9.0 # via # doc8 # readme-renderer @@ -61,11 +65,11 @@ pyparsing==2.4.7 # via packaging python-dateutil==2.8.1 # via -r requirements/base.in -pytz==2020.5 +pytz==2021.1 # via # babel # django -readme-renderer==28.0 +readme-renderer==29.0 # via # -r requirements/doc.in # twine @@ -79,13 +83,13 @@ requests==2.25.1 # twine restructuredtext-lint==1.3.2 # via doc8 -rfc3986==1.4.0 +rfc3986==1.5.0 # via twine sailthru-client==2.2.3 # via -r requirements/base.in simplejson==3.17.2 # via sailthru-client -six==1.15.0 +six==1.16.0 # via # -r requirements/base.in # bleach @@ -95,7 +99,7 @@ six==1.15.0 # readme-renderer snowballstemmer==2.1.0 # via sphinx -sphinx==3.4.3 +sphinx==4.0.3 # via # -r requirements/doc.in # edx-sphinx-theme @@ -103,13 +107,13 @@ sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==1.0.3 +sphinxcontrib-htmlhelp==2.0.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-qthelp==1.0.3 # via sphinx -sphinxcontrib-serializinghtml==1.1.4 +sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.4.1 # via django @@ -117,14 +121,16 @@ stevedore==3.3.0 # via # -r requirements/base.in # doc8 -tqdm==4.56.0 +tqdm==4.61.2 # via twine -twine==3.3.0 +twine==3.4.1 # via -r requirements/doc.in -urllib3==1.26.3 +urllib3==1.26.6 # via requests webencodings==0.5.1 # via bleach +zipp==3.5.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/quality.txt b/requirements/quality.txt index d8f0ac77..58cc2618 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,67 +4,64 @@ # # make upgrade # -astroid==2.4.2 +astroid==2.6.2 # via # pylint # pylint-celery click-log==0.3.2 # via edx-lint -click==7.1.2 +click==8.0.1 # via # click-log # code-annotations # edx-lint -code-annotations==1.0.2 +code-annotations==1.1.2 # via edx-lint # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # code-annotations # edx-lint -edx-lint==3.0.2 +edx-lint==5.0.0 # via -r requirements/quality.in -isort==5.7.0 +isort==5.9.2 # via # -r requirements/quality.in # pylint -jinja2==2.11.2 +jinja2==3.0.1 # via code-annotations -lazy-object-proxy==1.4.3 +lazy-object-proxy==1.6.0 # via astroid -markupsafe==1.1.1 +markupsafe==2.0.1 # via jinja2 mccabe==0.6.1 # via pylint -pbr==5.5.1 +pbr==5.6.0 # via stevedore -pycodestyle==2.6.0 +pycodestyle==2.7.0 # via -r requirements/quality.in -pydocstyle==5.1.1 +pydocstyle==6.1.1 # via -r requirements/quality.in pylint-celery==0.3 # via edx-lint -pylint-django==2.4.2 +pylint-django==2.4.4 # via edx-lint pylint-plugin-utils==0.6 # via # pylint-celery # pylint-django -pylint==2.6.0 +pylint==2.9.3 # via # edx-lint # pylint-celery # pylint-django # pylint-plugin-utils -python-slugify==4.0.1 +python-slugify==5.0.2 # via code-annotations -pytz==2020.5 +pytz==2021.1 # via django pyyaml==5.4.1 # via code-annotations -six==1.15.0 - # via - # astroid - # edx-lint +six==1.16.0 + # via edx-lint snowballstemmer==2.1.0 # via pydocstyle sqlparse==0.4.1 diff --git a/requirements/test.txt b/requirements/test.txt index 73453625..6793e08e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,55 +4,61 @@ # # make upgrade # -attrs==20.3.0 +attrs==21.2.0 # via # -r requirements/base.in # hypothesis # pytest -certifi==2020.12.5 +certifi==2021.5.30 # via requests chardet==4.0.0 # via requests -coverage==5.4 +coverage==5.5 # via pytest-cov -ddt==1.4.1 +ddt==1.4.2 # via -r requirements/test.in # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in hypothesis-pytest==0.19.0 # via -r requirements/test.in -hypothesis[pytz]==6.0.4 +hypothesis[pytz]==6.14.1 # via # -r requirements/test.in # hypothesis-pytest idna==2.10 # via requests +importlib-metadata==4.6.1 + # via pytest-randomly iniconfig==1.1.1 # via pytest +jedi==0.18.0 + # via pudb mock==4.0.3 # via -r requirements/test.in -packaging==20.8 +packaging==21.0 # via pytest -pbr==5.5.1 +parso==0.8.2 + # via jedi +pbr==5.6.0 # via stevedore pluggy==0.13.1 # via pytest -pudb==2020.1 +pudb==2021.1 # via -r requirements/test.in py==1.10.0 # via pytest -pygments==2.7.4 +pygments==2.9.0 # via pudb pyparsing==2.4.7 # via packaging -pytest-cov==2.11.1 +pytest-cov==2.12.1 # via -r requirements/test.in -pytest-django==4.1.0 +pytest-django==4.4.0 # via -r requirements/test.in -pytest-randomly==3.5.0 +pytest-randomly==3.8.0 # via -r requirements/test.in -pytest==6.2.2 +pytest==6.2.4 # via # hypothesis-pytest # pytest-cov @@ -60,7 +66,7 @@ pytest==6.2.2 # pytest-randomly python-dateutil==2.8.1 # via -r requirements/base.in -pytz==2020.5 +pytz==2021.1 # via # django # hypothesis @@ -70,19 +76,23 @@ sailthru-client==2.2.3 # via -r requirements/base.in simplejson==3.17.2 # via sailthru-client -six==1.15.0 +six==1.16.0 # via # -r requirements/base.in # python-dateutil -sortedcontainers==2.3.0 +sortedcontainers==2.4.0 # via hypothesis sqlparse==0.4.1 # via django stevedore==3.3.0 # via -r requirements/base.in toml==0.10.2 - # via pytest -urllib3==1.26.3 + # via + # pytest + # pytest-cov +urllib3==1.26.6 # via requests urwid==2.1.2 # via pudb +zipp==3.5.0 + # via importlib-metadata diff --git a/requirements/travis.txt b/requirements/travis.txt index 2412315c..9d187de8 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -6,15 +6,15 @@ # appdirs==1.4.4 # via virtualenv -certifi==2020.12.5 +certifi==2021.5.30 # via requests chardet==4.0.0 # via requests codecov==2.1.11 # via -r requirements/travis.in -coverage==5.4 +coverage==5.5 # via codecov -distlib==0.3.1 +distlib==0.3.2 # via virtualenv filelock==3.0.12 # via @@ -22,7 +22,7 @@ filelock==3.0.12 # virtualenv idna==2.10 # via requests -packaging==20.8 +packaging==21.0 # via tox pluggy==0.13.1 # via tox @@ -32,7 +32,7 @@ pyparsing==2.4.7 # via packaging requests==2.25.1 # via codecov -six==1.15.0 +six==1.16.0 # via # tox # virtualenv @@ -40,11 +40,11 @@ toml==0.10.2 # via tox tox-battery==0.2 # via -r requirements/travis.in -tox==3.21.3 +tox==3.23.1 # via # -r requirements/travis.in # tox-battery -urllib3==1.26.3 +urllib3==1.26.6 # via requests -virtualenv==20.4.0 +virtualenv==20.4.7 # via tox