From a57fb4db13df586ff9870cbba41cf8f7180f4cdc 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 explicitly in bundled.in 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/edx/base.txt | 3 ++- requirements/edx/bundled.in | 3 +++ requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 50c16e065b93..9e382e0e96cc 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -53,8 +53,9 @@ 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 + # -r requirements/edx/bundled.in # celery # django # icalendar diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index b4685a3a2cbe..cd227b494075 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -48,3 +48,6 @@ ora2>=4.5.0 # Open Response Assessment XBlock xblock-poll # Xblock for polling users xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar + +# 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/development.txt b/requirements/edx/development.txt index f1c13c031a0d..cdfefa82e0f0 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -110,7 +110,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 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index a512f4ddf25a..ffbbbbda1bf8 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -74,7 +74,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 # -r requirements/edx/base.txt # celery diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 8c7ba2ee1fac..c42ed5395dd4 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -76,7 +76,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 # -r requirements/edx/base.txt # celery