From 02c15469e8475fe1cb013d16e1243d9dd9fb92a9 Mon Sep 17 00:00:00 2001 From: irtazaakram Date: Thu, 5 Oct 2023 12:21:42 +0500 Subject: [PATCH 01/15] fix: django 4.2 issues --- .github/workflows/ci.yml | 5 ++-- Makefile | 10 ------- requirements/base.txt | 16 +++++----- requirements/constraints.txt | 5 ++-- requirements/devstack.txt | 34 +++++++++++---------- requirements/docs.txt | 8 ++--- requirements/local.txt | 34 +++++++++++---------- requirements/monitoring/requirements.txt | 38 ++++++++++++++---------- requirements/production.txt | 26 ++++++++-------- requirements/test.txt | 28 +++++++++-------- tox.ini | 5 ++-- 11 files changed, 108 insertions(+), 101 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf9c69d9..76764ba4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,12 +13,13 @@ jobs: name: Tests runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: - ubuntu-20.04 python-version: - 3.8 - toxenv: [ django32 ] + toxenv: [ django32, django42 ] steps: - uses: actions/checkout@v1 - name: setup python @@ -45,7 +46,7 @@ jobs: make static make validate_translations - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django32' + if: matrix.python-version == '3.8' && matrix.toxenv=='django42' uses: codecov/codecov-action@v1 with: flags: unittests diff --git a/Makefile b/Makefile index 7ad820af..21a017ec 100644 --- a/Makefile +++ b/Makefile @@ -57,16 +57,6 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## re-compile requirements .txt files from .in files - sed 's/pyjwt\[crypto\]<2.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/social-auth-core<4.0.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt diff --git a/requirements/base.txt b/requirements/base.txt index 88c65b3d..9968f0a1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,6 +14,8 @@ async-timeout==4.0.3 # via redis backoff==1.10.0 # via analytics-python +backports-zoneinfo==0.2.1 + # via django billiard==3.6.4.0 # via celery celery==4.4.7 @@ -23,11 +25,11 @@ celery==4.4.7 # django-user-tasks certifi==2023.7.22 # via requests -cffi==1.15.1 +cffi==1.16.0 # via # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via requests click==8.1.7 # via edx-django-utils @@ -35,13 +37,12 @@ cryptography==41.0.4 # via # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # python3-openid # social-auth-core django==3.2.21 # via - # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in # django-cors-headers @@ -82,7 +83,7 @@ django-simple-history==3.0.0 # via # -c requirements/common_constraints.txt # -r requirements/base.in -django-storages==1.8 +django-storages==1.10 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -139,7 +140,7 @@ oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via drf-yasg pbr==5.11.1 # via stevedore @@ -166,7 +167,6 @@ pytz==2023.3.post1 # via # -r requirements/base.in # celery - # django # djangorestframework # drf-yasg pyyaml==6.0.1 @@ -215,7 +215,7 @@ typing-extensions==4.8.0 # edx-opaque-keys uritemplate==4.1.1 # via drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -c requirements/constraints.txt # requests diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 6994b426..2facec1a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -16,8 +16,9 @@ Django<4.0 # Version 3.2.0 contains bad arabic translations that will cause validation tests to fail django-extensions<3.2.0 -# django-storages version 1.9 drops support for boto storage backend. -django-storages<1.9 +# django-storages version 1.10.1 is major upgrade. +django-storages==1.10.1 + # From base.in celery<5.0 # version 5.0 drops support for python 3.5 diff --git a/requirements/devstack.txt b/requirements/devstack.txt index a39a4b67..bdab4e59 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -31,7 +31,7 @@ async-timeout==4.0.3 # via # -r requirements/local.txt # redis -babel==2.12.1 +babel==2.13.0 # via # -r requirements/local.txt # pydata-sphinx-theme @@ -40,6 +40,10 @@ backoff==1.10.0 # via # -r requirements/local.txt # analytics-python +backports-zoneinfo==0.2.1 + # via + # -r requirements/local.txt + # django beautifulsoup4==4.12.2 # via # -r requirements/local.txt @@ -48,12 +52,12 @@ billiard==3.6.4.0 # via # -r requirements/local.txt # celery -boto3==1.28.54 +boto3==1.28.56 # via # -c requirements/constraints.txt # -r requirements/local.txt # moto -botocore==1.31.54 +botocore==1.31.56 # via # -r requirements/local.txt # boto3 @@ -68,12 +72,12 @@ certifi==2023.7.22 # via # -r requirements/local.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/local.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/local.txt # requests @@ -109,7 +113,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/local.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/local.txt # python3-openid @@ -124,7 +128,6 @@ distlib==0.3.7 # virtualenv django==3.2.21 # via - # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/local.txt # django-cors-headers @@ -173,7 +176,7 @@ django-simple-history==3.0.0 # via # -c requirements/common_constraints.txt # -r requirements/local.txt -django-storages==1.8 +django-storages==1.10 # via # -c requirements/constraints.txt # -r requirements/local.txt @@ -320,7 +323,7 @@ oauthlib==3.2.2 # -r requirements/local.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/local.txt # drf-yasg @@ -340,7 +343,7 @@ pbr==5.11.1 # via # -r requirements/local.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via # -r requirements/local.txt # pylint @@ -450,7 +453,6 @@ pytz==2023.3.post1 # -r requirements/local.txt # babel # celery - # django # djangorestframework # drf-yasg pywatchman==1.4.1 @@ -486,7 +488,7 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/local.txt # moto -ruamel-yaml==0.17.32 +ruamel-yaml==0.17.35 # via # -r requirements/local.txt # ruamel-yaml-base @@ -496,7 +498,7 @@ ruamel-yaml-base==0.3.2 # via # -r requirements/local.txt # ruamel-yaml-cmd -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via # -r requirements/local.txt # ruamel-yaml @@ -506,7 +508,7 @@ ruamel-yaml-convert==0.3.2 # via # -r requirements/local.txt # ruamel-yaml-cmd -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/local.txt # boto3 @@ -622,7 +624,7 @@ uritemplate==4.1.1 # via # -r requirements/local.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -c requirements/constraints.txt # -r requirements/local.txt @@ -638,7 +640,7 @@ virtualenv==20.24.5 # via # -r requirements/local.txt # tox -werkzeug==2.3.7 +werkzeug==3.0.0 # via # -r requirements/local.txt # moto diff --git a/requirements/docs.txt b/requirements/docs.txt index 350994fd..020ef92a 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -8,7 +8,7 @@ accessible-pygments==0.0.4 # via pydata-sphinx-theme alabaster==0.7.13 # via sphinx -babel==2.12.1 +babel==2.13.0 # via # pydata-sphinx-theme # sphinx @@ -16,7 +16,7 @@ beautifulsoup4==4.12.2 # via pydata-sphinx-theme certifi==2023.7.22 # via requests -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via requests docutils==0.19 # via @@ -32,7 +32,7 @@ jinja2==3.1.2 # via sphinx markupsafe==2.1.3 # via jinja2 -packaging==23.1 +packaging==23.2 # via # pydata-sphinx-theme # sphinx @@ -72,7 +72,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx typing-extensions==4.8.0 # via pydata-sphinx-theme -urllib3==1.26.16 +urllib3==1.26.17 # via # -c requirements/constraints.txt # requests diff --git a/requirements/local.txt b/requirements/local.txt index 68ac0c23..976b31da 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -31,7 +31,7 @@ async-timeout==4.0.3 # via # -r requirements/test.txt # redis -babel==2.12.1 +babel==2.13.0 # via # -r requirements/docs.txt # pydata-sphinx-theme @@ -40,6 +40,10 @@ backoff==1.10.0 # via # -r requirements/test.txt # analytics-python +backports-zoneinfo==0.2.1 + # via + # -r requirements/test.txt + # django beautifulsoup4==4.12.2 # via # -r requirements/docs.txt @@ -48,12 +52,12 @@ billiard==3.6.4.0 # via # -r requirements/test.txt # celery -boto3==1.28.54 +boto3==1.28.56 # via # -c requirements/constraints.txt # -r requirements/test.txt # moto -botocore==1.31.54 +botocore==1.31.56 # via # -r requirements/test.txt # boto3 @@ -69,12 +73,12 @@ certifi==2023.7.22 # -r requirements/docs.txt # -r requirements/test.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -109,7 +113,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/test.txt # python3-openid @@ -124,7 +128,6 @@ distlib==0.3.7 # virtualenv django==3.2.21 # via - # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt # django-cors-headers @@ -173,7 +176,7 @@ django-simple-history==3.0.0 # via # -c requirements/common_constraints.txt # -r requirements/test.txt -django-storages==1.8 +django-storages==1.10 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -319,7 +322,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -338,7 +341,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via # -r requirements/test.txt # pylint @@ -443,7 +446,6 @@ pytz==2023.3.post1 # -r requirements/test.txt # babel # celery - # django # djangorestframework # drf-yasg pywatchman==1.4.1 @@ -480,20 +482,20 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/test.txt # moto -ruamel-yaml==0.17.32 +ruamel-yaml==0.17.35 # via # ruamel-yaml-base # ruamel-yaml-cmd # ruamel-yaml-convert ruamel-yaml-base==0.3.2 # via ruamel-yaml-cmd -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via ruamel-yaml ruamel-yaml-cmd==0.6.5 # via -r requirements/local.in ruamel-yaml-convert==0.3.2 # via ruamel-yaml-cmd -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 @@ -608,7 +610,7 @@ uritemplate==4.1.1 # via # -r requirements/test.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -c requirements/constraints.txt # -r requirements/docs.txt @@ -625,7 +627,7 @@ virtualenv==20.24.5 # via # -r requirements/test.txt # tox -werkzeug==2.3.7 +werkzeug==3.0.0 # via # -r requirements/test.txt # moto diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index 699dd94b..a25bbbe9 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -48,7 +48,7 @@ async-timeout==4.0.3 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # redis -babel==2.12.1 +babel==2.13.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -61,6 +61,13 @@ backoff==1.10.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python +backports-zoneinfo==0.2.1 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # django beautifulsoup4==4.12.2 # via # -r requirements/monitoring/../devstack.txt @@ -73,14 +80,14 @@ billiard==3.6.4.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # celery -boto3==1.28.54 +boto3==1.28.56 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # moto -botocore==1.31.54 +botocore==1.31.56 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -103,7 +110,7 @@ certifi==2023.7.22 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -111,7 +118,7 @@ cffi==1.15.1 # -r requirements/monitoring/../test.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -165,7 +172,7 @@ ddt==1.6.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -264,7 +271,7 @@ django-simple-history==3.0.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt -django-storages==1.8 +django-storages==1.10 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -401,7 +408,7 @@ freezegun==1.2.2 # -r requirements/monitoring/../test.txt gevent==23.9.1 # via -r requirements/monitoring/../production.txt -greenlet==2.0.2 +greenlet==3.0.0 # via # -r requirements/monitoring/../production.txt # gevent @@ -522,7 +529,7 @@ oauthlib==3.2.2 # -r requirements/monitoring/../test.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -552,7 +559,7 @@ pbr==5.11.1 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -719,7 +726,6 @@ pytz==2023.3.post1 # -r requirements/monitoring/../test.txt # babel # celery - # django # djangorestframework # drf-yasg pywatchman==1.4.1 @@ -771,7 +777,7 @@ responses==0.17.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # moto -ruamel-yaml==0.17.32 +ruamel-yaml==0.17.35 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -783,7 +789,7 @@ ruamel-yaml-base==0.3.2 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # ruamel-yaml-cmd -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -797,7 +803,7 @@ ruamel-yaml-convert==0.3.2 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # ruamel-yaml-cmd -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -960,7 +966,7 @@ uritemplate==4.1.1 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -983,7 +989,7 @@ virtualenv==20.24.5 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # tox -werkzeug==2.3.7 +werkzeug==3.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt diff --git a/requirements/production.txt b/requirements/production.txt index 1d1b494d..29b4a9f4 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -22,15 +22,19 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python +backports-zoneinfo==0.2.1 + # via + # -r requirements/base.txt + # django billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.28.54 +boto3==1.28.56 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.31.54 +botocore==1.31.56 # via # boto3 # s3transfer @@ -43,12 +47,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/base.txt # requests @@ -61,14 +65,13 @@ cryptography==41.0.4 # -r requirements/base.txt # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/base.txt # python3-openid # social-auth-core django==3.2.21 # via - # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.txt # django-cors-headers @@ -111,7 +114,7 @@ django-simple-history==3.0.0 # via # -c requirements/common_constraints.txt # -r requirements/base.txt -django-storages==1.8 +django-storages==1.10 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -160,7 +163,7 @@ edx-rest-api-client==5.6.0 # via -r requirements/base.txt gevent==23.9.1 # via -r requirements/production.in -greenlet==2.0.2 +greenlet==3.0.0 # via gevent gunicorn==21.2.0 # via -r requirements/production.in @@ -198,7 +201,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/base.txt # drf-yasg @@ -248,7 +251,6 @@ pytz==2023.3.post1 # via # -r requirements/base.txt # celery - # django # djangorestframework # drf-yasg pyyaml==6.0.1 @@ -272,7 +274,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -s3transfer==0.6.2 +s3transfer==0.7.0 # via boto3 semantic-version==2.10.0 # via @@ -318,7 +320,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -c requirements/constraints.txt # -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index d3cc81a9..b221fe07 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -26,15 +26,19 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python +backports-zoneinfo==0.2.1 + # via + # -r requirements/base.txt + # django billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.28.54 +boto3==1.28.56 # via # -c requirements/constraints.txt # moto -botocore==1.31.54 +botocore==1.31.56 # via # boto3 # moto @@ -48,12 +52,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/base.txt # requests @@ -83,7 +87,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/test.in -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/base.txt # python3-openid @@ -93,7 +97,6 @@ dill==0.3.7 distlib==0.3.7 # via virtualenv # via - # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.txt # django-cors-headers @@ -138,7 +141,7 @@ django-simple-history==3.0.0 # via # -c requirements/common_constraints.txt # -r requirements/base.txt -django-storages==1.8 +django-storages==1.10 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -251,7 +254,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/base.txt # drf-yasg @@ -263,7 +266,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via # pylint # virtualenv @@ -342,7 +345,6 @@ pytz==2023.3.post1 # via # -r requirements/base.txt # celery - # django # djangorestframework # drf-yasg pyyaml==6.0.1 @@ -374,7 +376,7 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/test.in # moto -s3transfer==0.6.2 +s3transfer==0.7.0 # via boto3 semantic-version==2.10.0 # via @@ -439,7 +441,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -453,7 +455,7 @@ vine==1.3.0 # celery virtualenv==20.24.5 # via tox -werkzeug==2.3.7 +werkzeug==3.0.0 # via moto wrapt==1.13.3 # via diff --git a/tox.ini b/tox.ini index 3b51ebe2..3a48cd05 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,14 @@ [tox] -envlist = py38-django{32} +envlist = py38-django{32, 42} skipsdist = true [testenv] passenv = * deps = django32: -r requirements/django.txt + django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool /bin/bash -commands = {posargs:pytest} \ No newline at end of file +commands = {posargs:pytest} From 255bfff62d2b3994c8692ee5f0098e774d4d456c Mon Sep 17 00:00:00 2001 From: irtazaakram Date: Thu, 5 Oct 2023 14:59:53 +0500 Subject: [PATCH 02/15] fix: test --- registrar/apps/core/tests/test_discovery_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index f7ddadd9..e865f8e4 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -101,8 +101,8 @@ def setUp(self): super().setUp() cache.clear() - @mock_oauth_login @responses.activate + @mock_oauth_login @ddt.data( (200, program_from_discovery, program_from_discovery), (200, {}, {}), From bb8d030286fa0a4599bef714e7ebc39351a173ee Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 5 Oct 2023 17:54:37 +0500 Subject: [PATCH 03/15] chore: fixing --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 3a48cd05..1ffac7f0 100644 --- a/tox.ini +++ b/tox.ini @@ -12,3 +12,5 @@ whitelist_externals = i18n_tool /bin/bash commands = {posargs:pytest} +setenv = + AWS_DEFAULT_REGION=us-east-1 From e75af99a9d195960388653efb2fdc53fd1a2535c Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 5 Oct 2023 19:18:07 +0500 Subject: [PATCH 04/15] chore: When run `test_discovery_program_get` this test locally it fails due to cache issue. --- registrar/apps/core/tests/test_discovery_cache.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index e865f8e4..a0fe84b4 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -122,14 +122,23 @@ def test_discovery_program_get(self, disco_status, disco_json, expected_raw_data assert isinstance(loaded_program, ProgramDetails) assert loaded_program.uuid == self.program_uuid assert loaded_program.raw_data == expected_raw_data - self.assertEqual(len(responses.calls), 1) + + # due to cache issue, it fails when run it as single test. + + self.assertIn( + 'https://discovery-service-base/api/v1/programs/88888888-4444-2222-1111-000000000000', + [x.response.url for x in responses.calls] + ) # This should used the cached Discovery response. reloaded_program = ProgramDetails(self.program_uuid) assert isinstance(reloaded_program, ProgramDetails) assert reloaded_program.uuid == self.program_uuid assert reloaded_program.raw_data == expected_raw_data - self.assertEqual(len(responses.calls), 1) + self.assertIn( + 'https://discovery-service-base/api/v1/programs/88888888-4444-2222-1111-000000000000', + [x.response.url for x in responses.calls] + ) @patch_discovery_client_get_program(program_from_discovery) def test_active_curriculum(self): From f8fbad0f0b33245e782c088dec2177a01d3452da Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 20:09:17 +0500 Subject: [PATCH 05/15] chore: checking with django40 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1ffac7f0..a64bd4ad 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = true passenv = * deps = django32: -r requirements/django.txt - django42: Django>=4.2,<5.0 + django42: Django>=4.0,<4.1 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool From 2b5f72af103da5dfbda9037e537020f5b60e4932 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 20:32:13 +0500 Subject: [PATCH 06/15] chore: checking with django40 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a64bd4ad..27175f78 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = true passenv = * deps = django32: -r requirements/django.txt - django42: Django>=4.0,<4.1 + django42: Django>=4.1,<4.2 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool From e61ee674cc7c1cbbbb1cb685c0b5f8dcce7c8558 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 20:39:05 +0500 Subject: [PATCH 07/15] chore: checking with django40 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 27175f78..f0e0a231 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = true passenv = * deps = django32: -r requirements/django.txt - django42: Django>=4.1,<4.2 + django42: Django>=4.2,<4.2.4 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool From d621bc6f6e229cd751c25273f5e2cdbea060077f Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 20:45:12 +0500 Subject: [PATCH 08/15] chore: checking with django40 --- registrar/apps/core/tests/test_discovery_cache.py | 15 +++------------ tox.ini | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index a0fe84b4..f7ddadd9 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -101,8 +101,8 @@ def setUp(self): super().setUp() cache.clear() - @responses.activate @mock_oauth_login + @responses.activate @ddt.data( (200, program_from_discovery, program_from_discovery), (200, {}, {}), @@ -122,23 +122,14 @@ def test_discovery_program_get(self, disco_status, disco_json, expected_raw_data assert isinstance(loaded_program, ProgramDetails) assert loaded_program.uuid == self.program_uuid assert loaded_program.raw_data == expected_raw_data - - # due to cache issue, it fails when run it as single test. - - self.assertIn( - 'https://discovery-service-base/api/v1/programs/88888888-4444-2222-1111-000000000000', - [x.response.url for x in responses.calls] - ) + self.assertEqual(len(responses.calls), 1) # This should used the cached Discovery response. reloaded_program = ProgramDetails(self.program_uuid) assert isinstance(reloaded_program, ProgramDetails) assert reloaded_program.uuid == self.program_uuid assert reloaded_program.raw_data == expected_raw_data - self.assertIn( - 'https://discovery-service-base/api/v1/programs/88888888-4444-2222-1111-000000000000', - [x.response.url for x in responses.calls] - ) + self.assertEqual(len(responses.calls), 1) @patch_discovery_client_get_program(program_from_discovery) def test_active_curriculum(self): diff --git a/tox.ini b/tox.ini index f0e0a231..a64bd4ad 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = true passenv = * deps = django32: -r requirements/django.txt - django42: Django>=4.2,<4.2.4 + django42: Django>=4.0,<4.1 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool From 0c5a138a30d1428ac0e38fd330ea978863a44aed Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 21:59:23 +0500 Subject: [PATCH 09/15] chore: Fixing the test. --- registrar/apps/core/tests/test_discovery_cache.py | 3 ++- tox.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index f7ddadd9..eb168803 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -11,6 +11,7 @@ from django.conf import settings from django.core.cache import cache from django.test import TestCase +from ..tests.test_api_client import DiscoveryServiceClientTestCase from ..api_client import DISCOVERY_API_TPL, DiscoveryServiceClient from ..discovery_cache import ProgramDetails @@ -51,7 +52,7 @@ def patch_discovery_client_get_program(mock_response_data): @ddt.ddt -class ProgramDetailsTestCase(TestCase): +class ProgramDetailsTestCase(DiscoveryServiceClientTestCase): """ Test ProgramDetails interface to the Discovery data cache. """ diff --git a/tox.ini b/tox.ini index a64bd4ad..1ffac7f0 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = true passenv = * deps = django32: -r requirements/django.txt - django42: Django>=4.0,<4.1 + django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt whitelist_externals = i18n_tool From 1abb1861086996841f4b4795f871b68437dcdb29 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 22:06:56 +0500 Subject: [PATCH 10/15] chore: Fixing the quality. --- registrar/apps/core/tests/test_discovery_cache.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index eb168803..43340b5d 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -10,7 +10,6 @@ import responses from django.conf import settings from django.core.cache import cache -from django.test import TestCase from ..tests.test_api_client import DiscoveryServiceClientTestCase from ..api_client import DISCOVERY_API_TPL, DiscoveryServiceClient @@ -52,7 +51,7 @@ def patch_discovery_client_get_program(mock_response_data): @ddt.ddt -class ProgramDetailsTestCase(DiscoveryServiceClientTestCase): +class ProgramDetailsTestCase(DiscoveryServiceClientTestCase): # pylint: disable=test-inherits-tests """ Test ProgramDetails interface to the Discovery data cache. """ From 19a35859ebdb79356f5b52bcbb3142309a8016cf Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 6 Oct 2023 22:16:01 +0500 Subject: [PATCH 11/15] chore: Fixing the quality. --- registrar/apps/core/tests/test_discovery_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index 43340b5d..05d64b94 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -10,10 +10,10 @@ import responses from django.conf import settings from django.core.cache import cache -from ..tests.test_api_client import DiscoveryServiceClientTestCase from ..api_client import DISCOVERY_API_TPL, DiscoveryServiceClient from ..discovery_cache import ProgramDetails +from ..tests.test_api_client import DiscoveryServiceClientTestCase from .utils import mock_oauth_login From 903445c76a84ad788ab39c9c84f178170cbce135 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:55:41 -0400 Subject: [PATCH 12/15] chore: Updating Python Requirements (#566) --- requirements/base.txt | 9 +++------ requirements/devstack.txt | 18 +++++++++--------- requirements/local.txt | 16 +++++++--------- requirements/monitoring/requirements.txt | 21 ++++++++++----------- requirements/production.txt | 14 +++++--------- requirements/test.txt | 13 ++++--------- 6 files changed, 38 insertions(+), 53 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2e28b0b0..d0143f24 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,8 +14,6 @@ async-timeout==4.0.3 # via redis backoff==1.10.0 # via analytics-python -backports-zoneinfo==0.2.1 - # via django billiard==3.6.4.0 # via celery celery==4.4.7 @@ -37,12 +35,13 @@ cryptography==41.0.4 # via # pyjwt # social-auth-core -defusedxml==0.8.0rc1 +defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core django==3.2.22 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in # django-cors-headers @@ -81,9 +80,6 @@ django-mysql==4.11.0 # via -r requirements/base.in django-simple-history==3.4.0 # via -r requirements/base.in - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in django-storages==1.10.1 # via # -c requirements/constraints.txt @@ -168,6 +164,7 @@ pytz==2023.3.post1 # via # -r requirements/base.in # celery + # django # djangorestframework # drf-yasg pyyaml==6.0.1 diff --git a/requirements/devstack.txt b/requirements/devstack.txt index 9a903ea0..9c7e9594 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -40,10 +40,6 @@ backoff==1.10.0 # via # -r requirements/local.txt # analytics-python -backports-zoneinfo==0.2.1 - # via - # -r requirements/local.txt - # django beautifulsoup4==4.12.2 # via # -r requirements/local.txt @@ -52,12 +48,12 @@ billiard==3.6.4.0 # via # -r requirements/local.txt # celery -boto3==1.28.60 +boto3==1.28.61 # via # -c requirements/constraints.txt # -r requirements/local.txt # moto -botocore==1.31.60 +botocore==1.31.61 # via # -r requirements/local.txt # boto3 @@ -128,6 +124,7 @@ distlib==0.3.7 # virtualenv django==3.2.22 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/local.txt # django-cors-headers @@ -174,8 +171,6 @@ django-mysql==4.11.0 # via -r requirements/local.txt django-simple-history==3.4.0 # via -r requirements/local.txt - # -c requirements/common_constraints.txt - # -r requirements/local.txt django-storages==1.10.1 # via # -c requirements/constraints.txt @@ -222,7 +217,7 @@ edx-django-utils==5.7.0 # edx-rest-api-client edx-drf-extensions==8.10.0 # via -r requirements/local.txt -edx-i18n-tools==1.2.0 +edx-i18n-tools==1.3.0 # via -r requirements/local.txt edx-lint==5.3.4 # via -r requirements/local.txt @@ -292,6 +287,10 @@ lazy-object-proxy==1.9.0 # via # -r requirements/local.txt # astroid +lxml==4.9.3 + # via + # -r requirements/local.txt + # edx-i18n-tools lz4==4.3.2 # via # -r requirements/local.txt @@ -453,6 +452,7 @@ pytz==2023.3.post1 # -r requirements/local.txt # babel # celery + # django # djangorestframework # drf-yasg pywatchman==1.4.1 diff --git a/requirements/local.txt b/requirements/local.txt index 59fad097..c67b25e1 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -40,10 +40,6 @@ backoff==1.10.0 # via # -r requirements/test.txt # analytics-python -backports-zoneinfo==0.2.1 - # via - # -r requirements/test.txt - # django beautifulsoup4==4.12.2 # via # -r requirements/docs.txt @@ -52,12 +48,12 @@ billiard==3.6.4.0 # via # -r requirements/test.txt # celery -boto3==1.28.60 +boto3==1.28.61 # via # -c requirements/constraints.txt # -r requirements/test.txt # moto -botocore==1.31.60 +botocore==1.31.61 # via # -r requirements/test.txt # boto3 @@ -128,6 +124,7 @@ distlib==0.3.7 # virtualenv django==3.2.22 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/test.txt # django-cors-headers @@ -174,8 +171,6 @@ django-mysql==4.11.0 # via -r requirements/test.txt django-simple-history==3.4.0 # via -r requirements/test.txt - # -c requirements/common_constraints.txt - # -r requirements/test.txt django-storages==1.10.1 # via # -c requirements/constraints.txt @@ -222,7 +217,7 @@ edx-django-utils==5.7.0 # edx-rest-api-client edx-drf-extensions==8.10.0 # via -r requirements/test.txt -edx-i18n-tools==1.2.0 +edx-i18n-tools==1.3.0 # via -r requirements/local.in edx-lint==5.3.4 # via -r requirements/test.txt @@ -294,6 +289,8 @@ lazy-object-proxy==1.9.0 # via # -r requirements/test.txt # astroid +lxml==4.9.3 + # via edx-i18n-tools lz4==4.3.2 # via ruamel-yaml-cmd markupsafe==2.1.3 @@ -446,6 +443,7 @@ pytz==2023.3.post1 # -r requirements/test.txt # babel # celery + # django # djangorestframework # drf-yasg pywatchman==1.4.1 diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index 76d6aca5..05299c5a 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -61,13 +61,6 @@ backoff==1.10.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python -backports-zoneinfo==0.2.1 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../production.txt - # -r requirements/monitoring/../test.txt - # django beautifulsoup4==4.12.2 # via # -r requirements/monitoring/../devstack.txt @@ -80,14 +73,14 @@ billiard==3.6.4.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # celery -boto3==1.28.60 +boto3==1.28.61 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # moto -botocore==1.31.60 +botocore==1.31.61 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -355,7 +348,7 @@ edx-drf-extensions==8.10.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt -edx-i18n-tools==1.2.0 +edx-i18n-tools==1.3.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -479,6 +472,11 @@ lazy-object-proxy==1.9.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # astroid +lxml==4.9.3 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # edx-i18n-tools lz4==4.3.2 # via # -r requirements/monitoring/../devstack.txt @@ -726,6 +724,7 @@ pytz==2023.3.post1 # -r requirements/monitoring/../test.txt # babel # celery + # django # djangorestframework # drf-yasg pywatchman==1.4.1 @@ -1021,7 +1020,7 @@ zope-event==5.0 # via # -r requirements/monitoring/../production.txt # gevent -zope-interface==6.0 +zope-interface==6.1 # via # -r requirements/monitoring/../production.txt # gevent diff --git a/requirements/production.txt b/requirements/production.txt index 279c2ac2..92e9aef5 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -22,19 +22,15 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo==0.2.1 - # via - # -r requirements/base.txt - # django billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.28.60 +boto3==1.28.61 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.31.60 +botocore==1.31.61 # via # boto3 # s3transfer @@ -72,6 +68,7 @@ defusedxml==0.8.0rc2 # social-auth-core django==3.2.22 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.txt # django-cors-headers @@ -112,8 +109,6 @@ django-mysql==4.11.0 # via -r requirements/base.txt django-simple-history==3.4.0 # via -r requirements/base.txt - # -c requirements/common_constraints.txt - # -r requirements/base.txt django-storages==1.10.1 # via # -c requirements/constraints.txt @@ -251,6 +246,7 @@ pytz==2023.3.post1 # via # -r requirements/base.txt # celery + # django # djangorestframework # drf-yasg pyyaml==6.0.1 @@ -333,7 +329,7 @@ vine==1.3.0 # celery zope-event==5.0 # via gevent -zope-interface==6.0 +zope-interface==6.1 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 3168acc7..7249b52e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -26,19 +26,15 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo==0.2.1 - # via - # -r requirements/base.txt - # django billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.28.60 +boto3==1.28.61 # via # -c requirements/constraints.txt # moto -botocore==1.31.60 +botocore==1.31.61 # via # boto3 # moto @@ -97,6 +93,7 @@ dill==0.3.7 distlib==0.3.7 # via virtualenv # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.txt # django-cors-headers @@ -139,9 +136,6 @@ django-mysql==4.11.0 # via -r requirements/base.txt django-simple-history==3.4.0 # via -r requirements/base.txt - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt django-storages==1.10.1 # via # -c requirements/constraints.txt @@ -346,6 +340,7 @@ pytz==2023.3.post1 # via # -r requirements/base.txt # celery + # django # djangorestframework # drf-yasg pyyaml==6.0.1 From 2051c2ff34eb8bca0a3def45f2adc97ad7ccf96a Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Sat, 7 Oct 2023 16:24:59 +0500 Subject: [PATCH 13/15] chore: Fixing the quality. --- registrar/apps/core/tests/test_discovery_cache.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index 05d64b94..b5b8ff9d 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -10,10 +10,11 @@ import responses from django.conf import settings from django.core.cache import cache +from django.test import TestCase from ..api_client import DISCOVERY_API_TPL, DiscoveryServiceClient from ..discovery_cache import ProgramDetails -from ..tests.test_api_client import DiscoveryServiceClientTestCase +from ..tests.test_api_client import DiscoveryServiceClientTestCase # pylint: disable=unused-import from .utils import mock_oauth_login @@ -51,7 +52,7 @@ def patch_discovery_client_get_program(mock_response_data): @ddt.ddt -class ProgramDetailsTestCase(DiscoveryServiceClientTestCase): # pylint: disable=test-inherits-tests +class ProgramDetailsTestCase(TestCase): """ Test ProgramDetails interface to the Discovery data cache. """ From 8d7ec5d3c34a54d1fefc3ebdc1e768368efecd2d Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Sat, 7 Oct 2023 16:32:19 +0500 Subject: [PATCH 14/15] chore: Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76764ba4..996ecdc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,6 @@ jobs: name: Tests runs-on: ${{ matrix.os }} strategy: - fail-fast: false matrix: os: - ubuntu-20.04 From 77c0efa927964053c711f1c4ad61423087095df3 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Sat, 7 Oct 2023 16:42:44 +0500 Subject: [PATCH 15/15] chore: Update test_discovery_cache.py --- registrar/apps/core/tests/test_discovery_cache.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index b5b8ff9d..02b9ffd6 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -14,7 +14,8 @@ from ..api_client import DISCOVERY_API_TPL, DiscoveryServiceClient from ..discovery_cache import ProgramDetails -from ..tests.test_api_client import DiscoveryServiceClientTestCase # pylint: disable=unused-import +from ..tests.test_api_client import \ + DiscoveryServiceClientTestCase # pylint: disable=unused-import from .utils import mock_oauth_login