Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add Django 4.2 support in CI in Registrar #550

Closed
wants to merge 18 commits into from
+35 −32
Closed

Add Django 4.2 support in CI in Registrar #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
02c1546
fix: django 4.2 issues
irtazaakram Oct 5, 2023
255bfff
fix: test
irtazaakram Oct 5, 2023
bb8d030
chore: fixing
awais786 Oct 5, 2023
e75af99
chore: When run `test_discovery_program_get` this test locally it fai…
awais786 Oct 5, 2023
f8fbad0
chore: checking with django40
awais786 Oct 6, 2023
3856039
Merge branch 'master' into add-django42
awais786 Oct 6, 2023
2b5f72a
chore: checking with django40
awais786 Oct 6, 2023
0272db9
Merge remote-tracking branch 'origin/add-django42' into add-django42
awais786 Oct 6, 2023
e61ee67
chore: checking with django40
awais786 Oct 6, 2023
d621bc6
chore: checking with django40
awais786 Oct 6, 2023
0c5a138
chore: Fixing the test.
awais786 Oct 6, 2023
1abb186
chore: Fixing the quality.
awais786 Oct 6, 2023
19a3585
chore: Fixing the quality.
awais786 Oct 6, 2023
903445c
chore: Updating Python Requirements (#566)
edx-requirements-bot Oct 6, 2023
2051c2f
chore: Fixing the quality.
awais786 Oct 7, 2023
515ef27
Merge remote-tracking branch 'origin/add-django42' into add-django42
awais786 Oct 7, 2023
8d7ec5d
chore: Update ci.yml
awais786 Oct 7, 2023
77c0efa
chore: Update test_discovery_cache.py
awais786 Oct 7, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions registrar/apps/core/tests/test_discovery_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

from ..api_client import DISCOVERY_API_TPL, DiscoveryServiceClient
from ..discovery_cache import ProgramDetails
from ..tests.test_api_client import \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change needed?

DiscoveryServiceClientTestCase # pylint: disable=unused-import
from .utils import mock_oauth_login


Expand Down
4 changes: 0 additions & 4 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions requirements/devstack.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions requirements/local.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 9 additions & 4 deletions requirements/monitoring/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 2 additions & 5 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
commands = {posargs:pytest}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tox gives error locally due to boto issue.

setenv =
AWS_DEFAULT_REGION=us-east-1
Loading