Skip to content

Commit

Permalink
chore: upgrade django to version 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
christopappas committed Oct 2, 2023
1 parent 08df5d2 commit 7fceb33
Show file tree
Hide file tree
Showing 9 changed files with 120 additions and 106 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
os: [ubuntu-20.04]
python-version: [3.8]
test-target: [test, quality]
django-version: [3.2, 4.2]

steps:
- uses: actions/checkout@v1
Expand All @@ -35,8 +36,9 @@ jobs:
- name: Run Tests
env:
TARGETS: ${{ matrix.test-target }}
DJANGO_VERSIONS: ${{ matrix.django-version }}
run: |
docker exec ecomworker bash -c "cd /edx/app/ecomworker/ecomworker && make $TARGETS"
docker exec ecomworker bash -c "cd /edx/app/ecomworker/ecomworker && pip install django==$DJANGO_VERSIONS && make $TARGETS"
- name: Run Coverage
if: matrix.test-target == 'test'
Expand Down
42 changes: 22 additions & 20 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
#
amqp==2.6.1
# via kombu
asgiref==3.6.0
asgiref==3.7.2
# via django
async-timeout==4.0.2
async-timeout==4.0.3
# via redis
billiard==3.6.4.0
# via celery
celery==4.4.7
# via
# -c requirements/constraints.txt
# -r requirements/base.in
certifi==2022.12.7
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via pynacl
charset-normalizer==3.1.0
charset-normalizer==3.3.0
# via requests
click==8.1.3
click==8.1.7
# via edx-django-utils
django==3.2.18
django==3.2.21
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via edx-django-utils
django-waffle==3.0.0
django-waffle==4.0.0
# via edx-django-utils
edx-braze-client==0.1.6
edx-braze-client==0.1.7
# via -r requirements/base.in
edx-django-utils==5.4.0
edx-django-utils==5.7.0
# via edx-rest-api-client
edx-rest-api-client==5.5.0
edx-rest-api-client==5.6.0
# via -r requirements/base.in
idna==3.4
# via requests
kombu==4.6.11
# via celery
newrelic==8.8.0
newrelic==9.1.0
# via edx-django-utils
pbr==5.11.1
# via stevedore
psutil==5.9.5
# via edx-django-utils
pycparser==2.21
# via cffi
pyjwt==2.6.0
pyjwt==2.8.0
# via edx-rest-api-client
pynacl==1.5.0
# via edx-django-utils
pytz==2023.3
pytz==2023.3.post1
# via
# celery
# django
redis==4.5.4
redis==5.0.1
# via -r requirements/base.in
requests==2.28.2
requests==2.31.0
# via
# edx-rest-api-client
# slumber
Expand All @@ -72,9 +72,11 @@ slumber==0.7.1
# via edx-rest-api-client
sqlparse==0.4.4
# via django
stevedore==5.0.0
stevedore==5.1.0
# via edx-django-utils
urllib3==1.26.15
typing-extensions==4.8.0
# via asgiref
urllib3==2.0.5
# via requests
vine==1.3.0
# via
Expand Down
3 changes: 0 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
# These were previously pinned in ecommerce-worker, and will stay that way
# until we go through the process of relaxing them gradually.

# some other package are bringing django3.0 so adding constraint.
Django<3.3

# This file contains all common constraints for edx-repos
-c common_constraints.txt

Expand Down
4 changes: 2 additions & 2 deletions requirements/optional.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
#
newrelic==8.8.0
newrelic==9.1.0
# via -r requirements/optional.in
8 changes: 4 additions & 4 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
#
wheel==0.40.0
wheel==0.41.2
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.1.2
pip==23.2.1
# via -r requirements/pip.in
setuptools==67.7.2
setuptools==68.2.2
# via -r requirements/pip.in
21 changes: 14 additions & 7 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
#
build==0.10.0
build==1.0.3
# via pip-tools
click==8.1.3
click==8.1.7
# via pip-tools
packaging==23.1
importlib-metadata==6.8.0
# via build
pip-tools==6.13.0
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip_tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via build
wheel==0.40.0
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.41.2
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
46 changes: 25 additions & 21 deletions requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
Expand All @@ -8,11 +8,11 @@ amqp==2.6.1
# via
# -r requirements/base.txt
# kombu
asgiref==3.6.0
asgiref==3.7.2
# via
# -r requirements/base.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -r requirements/base.txt
# redis
Expand All @@ -24,44 +24,44 @@ celery==4.4.7
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
certifi==2022.12.7
certifi==2023.7.22
# via
# -r requirements/base.txt
# requests
cffi==1.15.1
cffi==1.16.0
# via
# -r requirements/base.txt
# pynacl
charset-normalizer==3.1.0
charset-normalizer==3.3.0
# via
# -r requirements/base.txt
# requests
click==8.1.3
click==8.1.7
# via
# -r requirements/base.txt
# edx-django-utils
django==3.2.18
django==3.2.21
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/base.txt
# edx-django-utils
edx-braze-client==0.1.6
edx-braze-client==0.1.7
# via -r requirements/base.txt
edx-django-utils==5.4.0
edx-django-utils==5.7.0
# via
# -r requirements/base.txt
# edx-rest-api-client
edx-rest-api-client==5.5.0
edx-rest-api-client==5.6.0
# via -r requirements/base.txt
idna==3.4
# via
Expand All @@ -71,7 +71,7 @@ kombu==4.6.11
# via
# -r requirements/base.txt
# celery
newrelic==8.8.0
newrelic==9.1.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -87,24 +87,24 @@ pycparser==2.21
# via
# -r requirements/base.txt
# cffi
pyjwt==2.6.0
pyjwt==2.8.0
# via
# -r requirements/base.txt
# edx-rest-api-client
pynacl==1.5.0
# via
# -r requirements/base.txt
# edx-django-utils
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/base.txt
# celery
# django
pyyaml==6.0
pyyaml==6.0.1
# via -r requirements/production.in
redis==4.5.4
redis==5.0.1
# via -r requirements/base.txt
requests==2.28.2
requests==2.31.0
# via
# -r requirements/base.txt
# edx-rest-api-client
Expand All @@ -119,11 +119,15 @@ sqlparse==0.4.4
# via
# -r requirements/base.txt
# django
stevedore==5.0.0
stevedore==5.1.0
# via
# -r requirements/base.txt
# edx-django-utils
urllib3==1.26.15
typing-extensions==4.8.0
# via
# -r requirements/base.txt
# asgiref
urllib3==2.0.5
# via
# -r requirements/base.txt
# requests
Expand Down
Loading

0 comments on commit 7fceb33

Please sign in to comment.