Skip to content

Commit

Permalink
chore: remove constraint and run make upgrade
Browse files Browse the repository at this point in the history 
There was an overly conservative and unnecessary constraint
on edx-django-utils. This constrains was also being advertised
with the package. The constraint has been removed and the
dependencies have been upgraded.
  • Loading branch information
@robrap
robrap committed Dec 21, 2021
1 parent 80aa4e6 commit da6e31b
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 53 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Change Log
Unreleased
~~~~~~~~~~

[2.2.2] - 2021-20-12
~~~~~~~~~~~~~~~~~~~~
* Updated dependencies after removing unnecessary constraint on edx-django-utils, so the constraint will no longer be advertised.

[2.2.1] - 2021-20-12
~~~~~~~~~~~~~~~~~~~~
* Replaced deprecated 'django.utils.translation.ugettext' with 'django.utils.translation.gettext'
Expand Down
2 changes: 1 addition & 1 deletion config_models/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Configuration models for Django allowing config management with auditing.
"""

__version__ = '2.2.1'
__version__ = '2.2.2'

default_app_config = 'config_models.apps.ConfigModelsConfig' # pylint: disable=invalid-name
21 changes: 14 additions & 7 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,28 @@ django==3.2.10
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-crum
# djangorestframework
# edx-django-utils
django-crum==0.7.9
# via edx-django-utils
django-waffle==2.2.1
# via edx-django-utils
djangorestframework==3.12.4
djangorestframework==3.13.1
# via -r requirements/base.in
edx-django-utils==4.4.1
# via -r requirements/base.in
edx-django-utils==2.0.4
# via
# -c requirements/constraints.txt
# -r requirements/base.in
newrelic==7.2.4.171
# via edx-django-utils
psutil==1.2.1
pbr==5.8.0
# via stevedore
psutil==5.8.0
# via edx-django-utils
pytz==2021.3
# via django
# via
# django
# djangorestframework
sqlparse==0.4.2
# via django
stevedore==3.5.0
# via edx-django-utils
5 changes: 0 additions & 5 deletions requirements/constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,3 @@

# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# We now use TieredCache from edx-django-utils. Putting this constaint just
# so that we don't get bitten by any backwards-incompatible changes that may
# happen in v3 of that library.
edx-django-utils<3
44 changes: 22 additions & 22 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ bleach==4.1.0
# via readme-renderer
certifi==2021.10.8
# via requests
cffi==1.15.0
# via cryptography
charset-normalizer==2.0.9
# via requests
colorama==0.4.4
Expand All @@ -30,30 +28,31 @@ coverage[toml]==6.2
# via
# -r requirements/test.txt
# pytest-cov
cryptography==36.0.0
# via secretstorage
ddt==1.4.4
# via -r requirements/test.txt
django==3.2.10
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# django-crum
# djangorestframework
# edx-django-utils
django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
django-waffle==2.2.1
# via
# -r requirements/test.txt
# edx-django-utils
djangorestframework==3.12.4
djangorestframework==3.13.1
# via -r requirements/test.txt
docutils==0.17.1
# via
# readme-renderer
# sphinx
edx-django-utils==2.0.4
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
edx-django-utils==4.4.1
# via -r requirements/test.txt
edx-sphinx-theme==3.0.0
# via -r requirements/doc.in
freezegun==1.1.0
Expand All @@ -62,18 +61,14 @@ idna==3.3
# via requests
imagesize==1.3.0
# via sphinx
importlib-metadata==4.8.2
importlib-metadata==4.10.0
# via
# keyring
# twine
iniconfig==1.1.1
# via
# -r requirements/test.txt
# pytest
jeepney==0.7.1
# via
# keyring
# secretstorage
jinja2==3.0.3
# via sphinx
keyring==23.4.0
Expand All @@ -90,22 +85,24 @@ packaging==21.3
# bleach
# pytest
# sphinx
pbr==5.8.0
# via
# -r requirements/test.txt
# stevedore
pkginfo==1.8.2
# via twine
pluggy==1.0.0
# via
# -r requirements/test.txt
# pytest
psutil==1.2.1
psutil==5.8.0
# via
# -r requirements/test.txt
# edx-django-utils
py==1.11.0
# via
# -r requirements/test.txt
# pytest
pycparser==2.21
# via cffi
pygments==2.10.0
# via
# readme-renderer
Expand All @@ -132,7 +129,8 @@ pytz==2021.3
# -r requirements/test.txt
# babel
# django
readme-renderer==31.0
# djangorestframework
readme-renderer==32.0
# via
# -r requirements/doc.in
# twine
Expand All @@ -145,8 +143,6 @@ 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
Expand All @@ -155,7 +151,7 @@ six==1.16.0
# python-dateutil
snowballstemmer==2.2.0
# via sphinx
sphinx==4.3.1
sphinx==4.3.2
# via
# -r requirements/doc.in
# edx-sphinx-theme
Expand All @@ -175,11 +171,15 @@ sqlparse==0.4.2
# via
# -r requirements/test.txt
# django
stevedore==3.5.0
# via
# -r requirements/test.txt
# edx-django-utils
toml==0.10.2
# via
# -r requirements/test.txt
# pytest
tomli==1.2.2
tomli==2.0.0
# via
# -r requirements/test.txt
# coverage
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pep517==0.12.0
# via pip-tools
pip-tools==6.4.0
# via -r requirements/pip-tools.in
tomli==1.2.2
tomli==2.0.0
# via pep517
wheel==0.37.0
# via pip-tools
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.37.0
# The following packages are considered to be unsafe in a requirements file:
pip==21.3.1
# via -r requirements/pip.in
setuptools==59.6.0
setuptools==60.0.3
# via -r requirements/pip.in
29 changes: 19 additions & 10 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,21 @@ django==3.2.10
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# django-crum
# djangorestframework
# edx-django-utils
django-waffle==2.2.1
django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
djangorestframework==3.12.4
# via -r requirements/test.txt
edx-django-utils==2.0.4
django-waffle==2.2.1
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# edx-django-utils
djangorestframework==3.13.1
# via -r requirements/test.txt
edx-django-utils==4.4.1
# via -r requirements/test.txt
edx-lint==5.2.1
# via -r requirements/quality.in
freezegun==1.1.0
Expand All @@ -59,7 +62,7 @@ isort==5.10.1
# via pylint
jinja2==3.0.3
# via code-annotations
lazy-object-proxy==1.6.0
lazy-object-proxy==1.7.1
# via astroid
markupsafe==2.0.1
# via jinja2
Expand All @@ -74,14 +77,16 @@ packaging==21.3
# -r requirements/test.txt
# pytest
pbr==5.8.0
# via stevedore
# via
# -r requirements/test.txt
# stevedore
platformdirs==2.4.0
# via pylint
pluggy==1.0.0
# via
# -r requirements/test.txt
# pytest
psutil==1.2.1
psutil==5.8.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -130,6 +135,7 @@ pytz==2021.3
# via
# -r requirements/test.txt
# django
# djangorestframework
pyyaml==6.0
# via code-annotations
six==1.16.0
Expand All @@ -144,15 +150,18 @@ sqlparse==0.4.2
# -r requirements/test.txt
# django
stevedore==3.5.0
# via code-annotations
# via
# -r requirements/test.txt
# code-annotations
# edx-django-utils
text-unidecode==1.3
# via python-slugify
toml==0.10.2
# via
# -r requirements/test.txt
# pylint
# pytest
tomli==1.2.2
tomli==2.0.0
# via
# -r requirements/test.txt
# coverage
Expand Down
24 changes: 18 additions & 6 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@ ddt==1.4.4
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# django-crum
# djangorestframework
# edx-django-utils
django-waffle==2.2.1
django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
# via -r requirements/base.txt
edx-django-utils==2.0.4
django-waffle==2.2.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# edx-django-utils
# via -r requirements/base.txt
edx-django-utils==4.4.1
# via -r requirements/base.txt
freezegun==1.1.0
# via -r requirements/test.in
iniconfig==1.1.1
Expand All @@ -38,9 +41,13 @@ newrelic==7.2.4.171
# edx-django-utils
packaging==21.3
# via pytest
pbr==5.8.0
# via
# -r requirements/base.txt
# stevedore
pluggy==1.0.0
# via pytest
psutil==1.2.1
psutil==5.8.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -62,13 +69,18 @@ pytz==2021.3
# via
# -r requirements/base.txt
# django
# djangorestframework
six==1.16.0
# via python-dateutil
sqlparse==0.4.2
# via
# -r requirements/base.txt
# django
stevedore==3.5.0
# via
# -r requirements/base.txt
# edx-django-utils
toml==0.10.2
# via pytest
tomli==1.2.2
tomli==2.0.0
# via coverage

2 comments on commit da6e31b

@timmc-edx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@robrap
Copy link
Contributor Author

@robrap robrap commented on da6e31b Dec 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this commit doesn't have a PR and @timmc-edx's comment is standing in for review.

Please sign in to comment.