Skip to content

Commit

Permalink
Merge pull request #71 from edx/revert-70-python311-upgrade
Browse files Browse the repository at this point in the history
Revert "feat!: Python 3.11 Upgrade"
  • Loading branch information
UsamaSadiq authored Dec 2, 2024
2 parents a9b1637 + 958fa5a commit e6d1f9f
Show file tree
Hide file tree
Showing 11 changed files with 187 additions and 106 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
run: docker exec -t analytics_api_testing bash -c "cd /edx/app/analytics_api/analytics_api/
&& export TOXENV=django42 && make test.requirements tox.requirements ${{ matrix.targets }}"

# - name: Run Coverage
# if: matrix.python-version == '3.11' && matrix.targets=='main.test'
# uses: codecov/codecov-action@v1
# with:
# fail_ci_if_error: true
- name: Run Coverage
if: matrix.python-version == '3.11' && matrix.targets=='main.test'
uses: codecov/codecov-action@v1
with:
fail_ci_if_error: true
40 changes: 25 additions & 15 deletions requirements/base.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.11
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -9,11 +9,16 @@ asgiref==3.8.1
# django
# django-cors-headers
# django-countries
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
boto==2.49.0
# via -r requirements/base.in
boto3==1.35.71
boto3==1.35.60
# via -r requirements/base.in
botocore==1.35.71
botocore==1.35.60
# via
# boto3
# s3transfer
Expand All @@ -31,7 +36,7 @@ coreapi==2.3.3
# via -r requirements/base.in
coreschema==0.0.4
# via coreapi
cryptography==44.0.0
cryptography==43.0.3
# via
# django-fernet-fields-v2
# pyjwt
Expand All @@ -55,7 +60,7 @@ django==4.2.16
# edx-drf-extensions
# edx-enterprise-data
# edx-rbac
django-cors-headers==4.6.0
django-cors-headers==4.4.0
# via -r requirements/base.in
django-countries==7.6.1
# via -r requirements/base.in
Expand All @@ -75,7 +80,7 @@ django-storages==1.10.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
django-waffle==4.2.0
django-waffle==4.1.0
# via
# edx-django-utils
# edx-drf-extensions
Expand Down Expand Up @@ -105,7 +110,7 @@ edx-ccx-keys==1.3.0
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==7.0.1
edx-django-utils==7.0.0
# via
# -r requirements/base.in
# edx-drf-extensions
Expand Down Expand Up @@ -134,12 +139,14 @@ edx-rest-api-client==6.0.0
# edx-enterprise-data
factory-boy==3.3.1
# via edx-enterprise-data
faker==33.1.0
faker==32.1.0
# via factory-boy
html5lib==1.1
# via -r requirements/base.in
idna==3.10
# via requests
importlib-metadata==8.5.0
# via markdown
inflection==0.5.1
# via drf-yasg
itypes==1.2.0
Expand All @@ -152,11 +159,11 @@ jmespath==1.0.1
# botocore
markdown==3.7
# via -r requirements/base.in
markupsafe==3.0.2
markupsafe==2.1.5
# via jinja2
mysql-connector-python==9.1.0
mysql-connector-python==9.0.0
# via edx-enterprise-data
newrelic==10.3.1
newrelic==10.2.0
# via edx-django-utils
numpy==1.24.4
# via
Expand All @@ -174,7 +181,7 @@ psutil==6.1.0
# via edx-django-utils
pycparser==2.22
# via cffi
pyjwt[crypto]==2.10.1
pyjwt[crypto]==2.9.0
# via
# drf-jwt
# edx-drf-extensions
Expand Down Expand Up @@ -208,7 +215,7 @@ requests==2.32.3
# edx-rest-api-client
rules==3.5
# via edx-enterprise-data
s3transfer==0.10.4
s3transfer==0.10.3
# via boto3
semantic-version==2.10.0
# via edx-drf-extensions
Expand All @@ -221,14 +228,15 @@ six==1.16.0
# python-dateutil
sqlparse==0.5.2
# via django
stevedore==5.4.0
stevedore==5.3.0
# via
# edx-django-utils
# edx-opaque-keys
tqdm==4.67.1
tqdm==4.67.0
# via -r requirements/base.in
typing-extensions==4.12.2
# via
# asgiref
# django-countries
# edx-opaque-keys
# faker
Expand All @@ -246,6 +254,8 @@ urllib3==1.26.20
# requests
webencodings==0.5.1
# via html5lib
zipp==3.20.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
2 changes: 1 addition & 1 deletion requirements/ci.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.11
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand Down
4 changes: 4 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ dnspython<2.7.0
# This constraint can be removed once Python 3.12 upgrade is complete
edx-enterprise-data<10.0.0

# backports-zoneinfo comes by-default in newer versions of python
# it gives error while building wheel with python>=3.9
backports.zoneinfo ; python_version < "3.9"

# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3
40 changes: 25 additions & 15 deletions requirements/dev.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.11
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -9,11 +9,16 @@ asgiref==3.8.1
# django
# django-cors-headers
# django-countries
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
boto==2.49.0
# via -r requirements/base.in
boto3==1.35.71
boto3==1.35.60
# via -r requirements/base.in
botocore==1.35.71
botocore==1.35.60
# via
# boto3
# s3transfer
Expand All @@ -31,7 +36,7 @@ coreapi==2.3.3
# via -r requirements/base.in
coreschema==0.0.4
# via coreapi
cryptography==44.0.0
cryptography==43.0.3
# via
# django-fernet-fields-v2
# pyjwt
Expand All @@ -55,7 +60,7 @@ django==4.2.16
# edx-drf-extensions
# edx-enterprise-data
# edx-rbac
django-cors-headers==4.6.0
django-cors-headers==4.4.0
# via -r requirements/base.in
django-countries==7.6.1
# via -r requirements/base.in
Expand All @@ -75,7 +80,7 @@ django-storages==1.10.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
django-waffle==4.2.0
django-waffle==4.1.0
# via
# edx-django-utils
# edx-drf-extensions
Expand Down Expand Up @@ -105,7 +110,7 @@ edx-ccx-keys==1.3.0
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==7.0.1
edx-django-utils==7.0.0
# via
# -r requirements/base.in
# edx-drf-extensions
Expand Down Expand Up @@ -134,12 +139,14 @@ edx-rest-api-client==6.0.0
# edx-enterprise-data
factory-boy==3.3.1
# via edx-enterprise-data
faker==33.1.0
faker==32.1.0
# via factory-boy
html5lib==1.1
# via -r requirements/base.in
idna==3.10
# via requests
importlib-metadata==8.5.0
# via markdown
inflection==0.5.1
# via drf-yasg
itypes==1.2.0
Expand All @@ -152,13 +159,13 @@ jmespath==1.0.1
# botocore
markdown==3.7
# via -r requirements/base.in
markupsafe==3.0.2
markupsafe==2.1.5
# via jinja2
mysql-connector-python==9.1.0
mysql-connector-python==9.0.0
# via edx-enterprise-data
mysqlclient==2.2.6
# via -r requirements/dev.in
newrelic==10.3.1
newrelic==10.2.0
# via edx-django-utils
numpy==1.24.4
# via
Expand All @@ -176,7 +183,7 @@ psutil==6.1.0
# via edx-django-utils
pycparser==2.22
# via cffi
pyjwt[crypto]==2.10.1
pyjwt[crypto]==2.9.0
# via
# drf-jwt
# edx-drf-extensions
Expand Down Expand Up @@ -210,7 +217,7 @@ requests==2.32.3
# edx-rest-api-client
rules==3.5
# via edx-enterprise-data
s3transfer==0.10.4
s3transfer==0.10.3
# via boto3
semantic-version==2.10.0
# via edx-drf-extensions
Expand All @@ -223,14 +230,15 @@ six==1.16.0
# python-dateutil
sqlparse==0.5.2
# via django
stevedore==5.4.0
stevedore==5.3.0
# via
# edx-django-utils
# edx-opaque-keys
tqdm==4.67.1
tqdm==4.67.0
# via -r requirements/base.in
typing-extensions==4.12.2
# via
# asgiref
# django-countries
# edx-opaque-keys
# faker
Expand All @@ -248,6 +256,8 @@ urllib3==1.26.20
# requests
webencodings==0.5.1
# via html5lib
zipp==3.20.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
Loading

0 comments on commit e6d1f9f

Please sign in to comment.