Merge pull request #348 from openedx/feanil/fix_deps

feanil/fix deps
openedx · Apr 3, 2024 · 0ac5572 · 0ac5572
2 parents 1597894 + 2a343dd
commit 0ac5572
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 36 deletions.
diff --git a/config_models/__init__.py b/config_models/__init__.py
@@ -2,4 +2,4 @@
 Configuration models for Django allowing config management with auditing.
 """
 
-__version__ = '2.6.0'
+__version__ = '2.7.0'
diff --git a/requirements/base.in b/requirements/base.in
@@ -4,5 +4,3 @@
 Django                      # Web application framework
 djangorestframework>=3.6
 edx-django-utils
-setuptools
-wheel
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -47,8 +47,3 @@ stevedore==5.2.0
     # via edx-django-utils
 typing-extensions==4.10.0
     # via asgiref
-wheel==0.43.0
-    # via -r requirements/base.in
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -78,7 +78,7 @@ django-waffle==4.1.0
     #   edx-django-utils
 djangorestframework==3.15.1
     # via -r requirements/quality.txt
-edx-django-release-util==1.3.0
+edx-django-release-util==1.4.0
     # via -r requirements/quality.txt
 edx-django-utils==5.12.0
     # via -r requirements/quality.txt
@@ -114,7 +114,7 @@ jinja2==3.1.3
     # via
     #   -r requirements/quality.txt
     #   code-annotations
-lxml==5.1.1
+lxml==5.2.1
     # via edx-i18n-tools
 markupsafe==2.1.5
     # via
@@ -286,7 +286,6 @@ virtualenv==20.25.1
 wheel==0.43.0
     # via
     #   -r requirements/pip-tools.txt
-    #   -r requirements/quality.txt
     #   pip-tools
 zipp==3.18.1
     # via

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -69,7 +69,7 @@ docutils==0.19
     #   pydata-sphinx-theme
     #   readme-renderer
     #   sphinx
-edx-django-release-util==1.3.0
+edx-django-release-util==1.4.0
     # via -r requirements/test.txt
 edx-django-utils==5.12.0
     # via -r requirements/test.txt
@@ -95,7 +95,7 @@ iniconfig==2.0.0
     # via
     #   -r requirements/test.txt
     #   pytest
-jaraco-classes==3.3.1
+jaraco-classes==3.4.0
     # via keyring
 jaraco-context==4.3.0
     # via keyring
@@ -107,7 +107,7 @@ jeepney==0.8.0
     #   secretstorage
 jinja2==3.1.3
     # via sphinx
-keyring==25.0.0
+keyring==25.1.0
     # via twine
 markdown-it-py==3.0.0
     # via rich
@@ -251,8 +251,6 @@ urllib3==2.2.1
     # via
     #   requests
     #   twine
-wheel==0.43.0
-    # via -r requirements/test.txt
 zipp==3.18.1
     # via
     #   importlib-metadata

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -60,7 +60,7 @@ django-waffle==4.1.0
     #   edx-django-utils
 djangorestframework==3.15.1
     # via -r requirements/test.txt
-edx-django-release-util==1.3.0
+edx-django-release-util==1.4.0
     # via -r requirements/test.txt
 edx-django-utils==5.12.0
     # via -r requirements/test.txt
@@ -185,5 +185,3 @@ typing-extensions==4.10.0
     #   asgiref
     #   astroid
     #   pylint
-wheel==0.43.0
-    # via -r requirements/test.txt
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -43,7 +43,7 @@ django-waffle==4.1.0
     #   -r requirements/base.txt
     #   edx-django-utils
     # via -r requirements/base.txt
-edx-django-release-util==1.3.0
+edx-django-release-util==1.4.0
     # via -r requirements/test.in
 edx-django-utils==5.12.0
     # via -r requirements/base.txt
@@ -109,5 +109,3 @@ typing-extensions==4.10.0
     # via
     #   -r requirements/base.txt
     #   asgiref
-wheel==0.43.0
-    # via -r requirements/base.txt
diff --git a/tox.ini b/tox.ini
@@ -14,27 +14,31 @@ addopts = --cov config_models --cov-report term-missing
 norecursedirs = .* docs requirements
 
 [testenv]
-setenv = 
+setenv =
     PYTHONPATH = {toxinidir}/mock_apps
     DJANGO_SETTINGS_MODULE = test_settings
-deps = 
+deps =
+    setuptools
+    wheel
     django42: Django>=4.2,<4.3
     drflatest: djangorestframework
     -r{toxinidir}/requirements/test.txt
-commands = 
+commands =
     python -Wd -m pytest --cov {posargs}
     python -m coverage html
 
 [testenv:docs]
-setenv = 
+setenv =
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
-allowlist_externals = 
+allowlist_externals =
     make
     rm
-deps = 
+deps =
+    setuptools
+    wheel
     -r{toxinidir}/requirements/doc.txt
-commands = 
+commands =
     rm -f docs/config_models.rst
     rm -f docs/modules.rst
     sphinx-apidoc -o docs/ config_models
@@ -44,25 +48,25 @@ commands =
     twine check dist/*
 
 [testenv:quality]
-setenv = 
+setenv =
     PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
-allowlist_externals = 
+allowlist_externals =
     make
     rm
     touch
-deps = 
+deps =
     -r{toxinidir}/requirements/quality.txt
-commands = 
+commands =
     pylint config_models
     pylint tests
     pycodestyle config_models tests
     make help
 
 [testenv:check_keywords]
-whitelist_externals = 
+whitelist_externals =
     make
-deps = 
+deps =
     -r{toxinidir}/requirements/test.txt
-commands = 
+commands =
     make check_keywords