Skip to content

Commit

Permalink
Revert "feat!: Python 3.12 Upgrade"
Browse files Browse the repository at this point in the history
  • Loading branch information
muhammad-ammar committed Sep 23, 2024
1 parent 3dda34a commit c095fcc
Show file tree
Hide file tree
Showing 19 changed files with 289 additions and 230 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.12']
python-version: ['3.8']
toxenv: [quality, data-django42, reporting-django42]

steps:
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.12' && (matrix.toxenv=='django42-data' || matrix.toxenv=='django42-reporting')
if: matrix.python-version == '3.8' && (matrix.toxenv=='django42-data' || matrix.toxenv=='django42-reporting')
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql8-migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ 3.12 ]
python-version: [ 3.8 ]

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v2
with:
python-version: 3.12
python-version: 3.8

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
team_reviewers: "business-enterprise-team"
email_address: enterprise-integrations@edx.org
send_success_notification: false
python_version: "3.12"
secrets:
requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Unreleased
----------

=========================
[9.0.0] - 2024-09-23
[9.0.1] - 2024-09-23
---------------------
* feat!: Python 3.12 Upgrade. Dropped support for ``Python<3.12``.
* revert: Revert "feat!: Python 3.12 Upgrade"

[8.13.0] - 2024-09-23
---------------------
Expand Down
2 changes: 1 addition & 1 deletion enterprise_data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Enterprise data api application. This Django app exposes API endpoints used by enterprises.
"""

__version__ = "9.0.0"
__version__ = "9.0.1"
4 changes: 2 additions & 2 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ django-model-utils
edx-rbac
rules
factory_boy
numpy
pandas
numpy<=1.24.4
pandas<=2.0.3
mysql-connector-python
65 changes: 36 additions & 29 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.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -10,27 +10,27 @@ asgiref==3.8.1
# via django
asn1crypto==1.5.1
# via snowflake-connector-python
awscli==1.34.16
awscli==1.33.40
# via -r requirements/reporting.in
bcrypt==4.2.0
# via paramiko
billiard==4.2.0
# via celery
boto3==1.35.16
boto3==1.34.158
# via -r requirements/reporting.in
botocore==1.35.16
botocore==1.34.158
# via
# awscli
# boto3
# s3transfer
celery==5.3.6
# via -r requirements/reporting.in
certifi==2024.8.30
certifi==2024.7.4
# via
# py2neo
# requests
# snowflake-connector-python
cffi==1.17.1
cffi==1.17.0
# via
# cryptography
# pynacl
Expand All @@ -54,7 +54,7 @@ click-repl==0.3.0
# via celery
colorama==0.4.6
# via awscli
cryptography==43.0.1
cryptography==42.0.8
# via
# -r requirements/reporting.in
# django-fernet-fields-v2
Expand All @@ -63,7 +63,7 @@ cryptography==43.0.1
# pyjwt
# pyopenssl
# snowflake-connector-python
django==4.2.16
django==4.2.15
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -85,7 +85,7 @@ django-fernet-fields-v2==0.9
# via -r requirements/base.in
django-filter==24.3
# via -r requirements/base.in
django-model-utils==5.0.0
django-model-utils==4.5.1
# via
# -r requirements/base.in
# edx-rbac
Expand All @@ -111,25 +111,25 @@ edx-django-utils==5.15.0
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.4.0
edx-drf-extensions==10.3.0
# via
# -r requirements/base.in
# edx-rbac
edx-opaque-keys==2.11.0
edx-opaque-keys==2.10.0
# via
# -r requirements/base.in
# edx-drf-extensions
edx-rbac==1.10.0
edx-rbac==1.9.0
# via -r requirements/base.in
edx-rest-api-client==6.0.0
edx-rest-api-client==5.7.1
# via -r requirements/base.in
factory-boy==3.3.1
factory-boy==3.3.0
# via -r requirements/base.in
faker==28.4.1
faker==26.3.0
# via factory-boy
filelock==3.16.0
filelock==3.15.4
# via snowflake-connector-python
idna==3.8
idna==3.7
# via
# requests
# snowflake-connector-python
Expand All @@ -147,33 +147,36 @@ mysql-connector-python==9.0.0
# via -r requirements/base.in
newrelic==9.13.0
# via edx-django-utils
numpy==2.1.1
numpy==1.24.4
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# pandas
packaging==24.1
# via
# py2neo
# snowflake-connector-python
pandas==2.2.2
# via -r requirements/base.in
pandas==2.0.3
# via
# -c requirements/constraints.txt
# -r requirements/base.in
pansi==2020.7.3
# via py2neo
paramiko==3.4.1
# via -r requirements/reporting.in
pbr==6.1.0
pbr==6.0.0
# via stevedore
pgpy==0.6.0
# via -r requirements/reporting.in
platformdirs==4.3.2
platformdirs==4.2.2
# via snowflake-connector-python
prompt-toolkit==3.0.47
# via click-repl
psutil==6.0.0
# via edx-django-utils
py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
# via -r requirements/reporting.in
pyasn1==0.6.1
pyasn1==0.6.0
# via
# pgpy
# rsa
Expand Down Expand Up @@ -204,7 +207,7 @@ python-dateutil==2.9.0.post0
# faker
# pandas
# vertica-python
pytz==2024.2
pytz==2024.1
# via
# interchange
# pandas
Expand All @@ -216,10 +219,11 @@ requests==2.32.3
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
# slumber
# snowflake-connector-python
rsa==4.7.2
# via awscli
rules==3.5
rules==3.4
# via -r requirements/base.in
s3transfer==0.10.2
# via
Expand All @@ -235,17 +239,19 @@ six==1.16.0
# py2neo
# python-dateutil
# vertica-python
snowflake-connector-python==3.12.1
slumber==0.7.1
# via edx-rest-api-client
snowflake-connector-python==3.12.0
# via -r requirements/reporting.in
sortedcontainers==2.4.0
# via snowflake-connector-python
sqlparse==0.5.1
# via django
stevedore==5.3.0
stevedore==5.2.0
# via
# edx-django-utils
# edx-opaque-keys
tomlkit==0.13.2
tomlkit==0.13.0
# via snowflake-connector-python
typing-extensions==4.12.2
# via
Expand All @@ -257,8 +263,9 @@ tzdata==2024.1
# pandas
unicodecsv==0.14.1
# via -r requirements/reporting.in
urllib3==2.2.2
urllib3==1.26.19
# via
# -c requirements/constraints.txt
# botocore
# py2neo
# requests
Expand Down
12 changes: 6 additions & 6 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.5.0
cachetools==5.4.0
# via tox
chardet==5.2.0
# via tox
Expand All @@ -14,23 +14,23 @@ coverage==7.6.1
# via -r requirements/ci.in
distlib==0.3.8
# via virtualenv
filelock==3.16.0
filelock==3.15.4
# via
# tox
# virtualenv
packaging==24.1
# via
# pyproject-api
# tox
platformdirs==4.3.2
platformdirs==4.2.2
# via
# tox
# virtualenv
pluggy==1.5.0
# via tox
pyproject-api==1.7.1
# via tox
tox==4.18.1
tox==4.17.1
# via -r requirements/ci.in
virtualenv==20.26.4
virtualenv==20.26.3
# via tox
9 changes: 9 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@

# Common constraints for edx repos
-c common_constraints.txt

# Needed for Django 4.2 + Python 3.12 compatibility
backports.zoneinfo; python_version<"3.9"

# botocore 1.34.145 depends on urllib3<1.27 and >=1.25.4; python_version < "3.10"
urllib3<2.0.0

numpy<=1.24.4
pandas<=2.0.3
Loading

0 comments on commit c095fcc

Please sign in to comment.