diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf9c69d9..996ecdc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - ubuntu-20.04 python-version: - 3.8 - toxenv: [ django32 ] + toxenv: [ django32, django42 ] steps: - uses: actions/checkout@v1 - name: setup python @@ -45,7 +45,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/registrar/apps/core/tests/test_discovery_cache.py b/registrar/apps/core/tests/test_discovery_cache.py index f7ddadd9..02b9ffd6 100644 --- a/registrar/apps/core/tests/test_discovery_cache.py +++ b/registrar/apps/core/tests/test_discovery_cache.py @@ -14,6 +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 .utils import mock_oauth_login diff --git a/requirements/base.txt b/requirements/base.txt index ade46361..d0143f24 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -80,11 +80,7 @@ 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 # -r requirements/base.in diff --git a/requirements/devstack.txt b/requirements/devstack.txt index 0eaf9b6f..9c7e9594 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -48,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 @@ -171,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 @@ -219,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 @@ -289,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 diff --git a/requirements/local.txt b/requirements/local.txt index 8d86360f..c67b25e1 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -48,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 @@ -171,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 @@ -219,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 @@ -291,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 diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index 146ae1c8..05299c5a 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -73,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 @@ -348,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 @@ -472,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 @@ -1015,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 e0622653..92e9aef5 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -26,11 +26,11 @@ 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 @@ -109,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 @@ -331,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 0fb030da..7249b52e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -30,11 +30,11 @@ 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 @@ -136,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 diff --git a/tox.ini b/tox.ini index 3b51ebe2..1ffac7f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,16 @@ [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} +setenv = + AWS_DEFAULT_REGION=us-east-1