Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feanil/fix deps #348

Merged
merged 2 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config_models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Configuration models for Django allowing config management with auditing.
"""

__version__ = '2.6.0'
__version__ = '2.7.0'
2 changes: 0 additions & 2 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@
Django # Web application framework
djangorestframework>=3.6
edx-django-utils
setuptools
wheel
5 changes: 0 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -185,5 +185,3 @@ typing-extensions==4.10.0
# asgiref
# astroid
# pylint
wheel==0.43.0
# via -r requirements/test.txt
4 changes: 1 addition & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -109,5 +109,3 @@ typing-extensions==4.10.0
# via
# -r requirements/base.txt
# asgiref
wheel==0.43.0
# via -r requirements/base.txt
32 changes: 18 additions & 14 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Loading