From e8d15f446e39207995b766cc16efea491be0dd7c Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Fri, 12 Jan 2024 09:59:35 -0500 Subject: [PATCH] fixup!: install library --- Makefile | 12 ++++++------ requirements/dev.txt | 5 +++++ requirements/doc.txt | 9 ++++++++- requirements/quality.txt | 9 ++++++++- requirements/test.in | 1 + requirements/test.txt | 9 ++++++++- test_settings.py | 3 ++- 7 files changed, 38 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f0aa743..e37ed34 100644 --- a/Makefile +++ b/Makefile @@ -56,12 +56,12 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/base.txt requirements/base.in - pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/test.txt requirements/test.in - pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/doc.txt requirements/doc.in - pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/quality.txt requirements/quality.in - pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/ci.txt requirements/ci.in - pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/dev.txt requirements/dev.in + pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild -o requirements/base.txt requirements/base.in + pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild -o requirements/test.txt requirements/test.in + pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild -o requirements/doc.txt requirements/doc.in + pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild -o requirements/quality.txt requirements/quality.in + pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild -o requirements/ci.txt requirements/ci.in + pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild -o requirements/dev.txt requirements/dev.in # Let tox control the Django and djangorestframework versions for tests sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt sed -i.tmp '/^djangorestframework==/d' requirements/test.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 833a139..6de6f4c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -60,6 +60,7 @@ django==3.2.23 # django-crum # django-waffle # djangorestframework + # edx-django-release-util # edx-django-utils # edx-i18n-tools django-crum==0.7.9 @@ -72,6 +73,8 @@ django-waffle==4.1.0 # edx-django-utils djangorestframework==3.14.0 # via -r requirements/quality.txt +edx-django-release-util==1.3.0 + # via -r requirements/quality.txt edx-django-utils==5.9.0 # via -r requirements/quality.txt edx-i18n-tools==1.3.0 @@ -219,11 +222,13 @@ pyyaml==6.0.1 # via # -r requirements/quality.txt # code-annotations + # edx-django-release-util # edx-i18n-tools six==1.16.0 # via # -r requirements/ci.txt # -r requirements/quality.txt + # edx-django-release-util # edx-lint # python-dateutil # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index cbb9894..660588a 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -47,6 +47,7 @@ django==3.2.23 # django-crum # django-waffle # djangorestframework + # edx-django-release-util # edx-django-utils django-crum==0.7.9 # via @@ -63,6 +64,8 @@ docutils==0.19 # pydata-sphinx-theme # readme-renderer # sphinx +edx-django-release-util==1.3.0 + # via -r requirements/test.txt edx-django-utils==5.9.0 # via -r requirements/test.txt exceptiongroup==1.2.0 @@ -163,9 +166,12 @@ python-dateutil==2.8.2 pytz==2023.3.post1 # via # -r requirements/test.txt - # babel # django # djangorestframework +pyyaml==6.0.1 + # via + # -r requirements/test.txt + # edx-django-release-util readme-renderer==42.0 # via # -r requirements/doc.in @@ -186,6 +192,7 @@ secretstorage==3.3.3 six==1.16.0 # via # -r requirements/test.txt + # edx-django-release-util # python-dateutil snowballstemmer==2.2.0 # via sphinx diff --git a/requirements/quality.txt b/requirements/quality.txt index eb9440c..9dcb5cd 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -43,6 +43,7 @@ django==3.2.23 # django-crum # django-waffle # djangorestframework + # edx-django-release-util # edx-django-utils django-crum==0.7.9 # via @@ -54,6 +55,8 @@ django-waffle==4.1.0 # edx-django-utils djangorestframework==3.14.0 # via -r requirements/test.txt +edx-django-release-util==1.3.0 + # via -r requirements/test.txt edx-django-utils==5.9.0 # via -r requirements/test.txt edx-lint==5.3.6 @@ -145,10 +148,14 @@ pytz==2023.3.post1 # django # djangorestframework pyyaml==6.0.1 - # via code-annotations + # via + # -r requirements/test.txt + # code-annotations + # edx-django-release-util six==1.16.0 # via # -r requirements/test.txt + # edx-django-release-util # edx-lint # python-dateutil snowballstemmer==2.2.0 diff --git a/requirements/test.in b/requirements/test.in index d50b2e4..c71b642 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -7,3 +7,4 @@ pytest-cov # pytest extension for code coverage statistics pytest-django # pytest extension for better Django support ddt # Run a test case multiple times with different input freezegun # Allows tests to mock the output of assorted datetime module functions +edx-django-release-util # Contains the reserved keyword check diff --git a/requirements/test.txt b/requirements/test.txt index d9f8fa5..b228b58 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -28,6 +28,7 @@ ddt==1.7.0 # django-crum # django-waffle # djangorestframework + # edx-django-release-util # edx-django-utils django-crum==0.7.9 # via @@ -38,6 +39,8 @@ django-waffle==4.1.0 # -r requirements/base.txt # edx-django-utils # via -r requirements/base.txt +edx-django-release-util==1.3.0 + # via -r requirements/test.in edx-django-utils==5.9.0 # via -r requirements/base.txt exceptiongroup==1.2.0 @@ -85,8 +88,12 @@ pytz==2023.3.post1 # -r requirements/base.txt # django # djangorestframework +pyyaml==6.0.1 + # via edx-django-release-util six==1.16.0 - # via python-dateutil + # via + # edx-django-release-util + # python-dateutil sqlparse==0.4.4 # via # -r requirements/base.txt diff --git a/test_settings.py b/test_settings.py index 9454f93..e9eac0f 100644 --- a/test_settings.py +++ b/test_settings.py @@ -33,7 +33,8 @@ def root(*args): 'django.contrib.contenttypes', 'example.apps.ExampleConfig', 'config_models', - 'tests' + 'tests', + 'release_util' ) LOCALE_PATHS = [