From 1d485ca2b84dca7006786679a754b018c53d34fa Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 14 Mar 2024 12:41:22 -0400 Subject: [PATCH] build: Don't require the backports.zoneinfo package for newer python. We do this so that we can build requirements files that could work to `pip install` on both the old (3.8) and new (3.11) versions of python. --- requirements/constraints.txt | 3 +++ requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- scripts/user_retirement/requirements/base.txt | 3 ++- scripts/user_retirement/requirements/testing.txt | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index dd0b48e09727..ad17ea9f3c3d 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -130,3 +130,6 @@ moto<5.0 # path==16.12.0 breaks the unit test collections check # needs to be investigated and fixed separately path<16.12.0 + +# Temporary to Support the python 3.11 Upgrade +backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 97dbdb1090be..4e027596a0c3 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -55,7 +55,7 @@ babel==2.14.0 # enmerkar-underscore backoff==1.10.0 # via analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via # -c requirements/edx/../constraints.txt # celery diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2c9482f60685..10b88b4afd9f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -111,7 +111,7 @@ backoff==1.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index d27ccebc4bfa..1a63a42e57de 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -78,7 +78,7 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 077ac742cb28..7dd6f913e9c0 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -78,7 +78,7 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index f66759b556fa..bd3fc4848f4f 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -10,8 +10,9 @@ attrs==23.2.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via + # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # django # pendulum boto3==1.34.26 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index b61e49596e9a..37444f469465 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -14,7 +14,7 @@ attrs==23.2.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -backports-zoneinfo==0.2.1 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r scripts/user_retirement/requirements/base.txt # django