From 97dc692ff8b237330c11b1eef99886c46a3377bd Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 27 Feb 2024 17:21:42 +0500 Subject: [PATCH] fix: pin backports.zoneinfo for python<3.9 only --- requirements/base.in | 1 + requirements/base.txt | 7 +++++-- requirements/common_constraints.txt | 2 ++ requirements/dev.txt | 7 +++++-- requirements/quality.txt | 7 +++++-- requirements/reporting.in | 1 + requirements/test-master.txt | 7 +++++-- requirements/test-reporting.txt | 2 ++ requirements/test.txt | 7 +++++-- 9 files changed, 31 insertions(+), 10 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 3453a660..bd7ea1cd 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -13,3 +13,4 @@ django-model-utils edx-rbac rules factory_boy +backports.zoneinfo;python_version<"3.9" # Can be removed once we upgrade to Python 3.12 diff --git a/requirements/base.txt b/requirements/base.txt index 31c0e326..721cdbb1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -12,8 +12,11 @@ asn1crypto==1.5.1 # via snowflake-connector-python awscli==1.32.50 # via -r requirements/reporting.in -backports-zoneinfo==0.2.1 - # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/base.in + # -r requirements/reporting.in + # django bcrypt==4.1.2 # via paramiko billiard==3.6.4.0 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 48b35742..58f0d529 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -1,6 +1,8 @@ + + # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/dev.txt b/requirements/dev.txt index 281ad9c9..c82938e6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -16,8 +16,11 @@ astroid==3.1.0 # pylint-celery awscli==1.32.50 # via -r requirements/reporting.in -backports-zoneinfo==0.2.1 - # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/base.in + # -r requirements/reporting.in + # django bcrypt==4.1.2 # via paramiko billiard==3.6.4.0 diff --git a/requirements/quality.txt b/requirements/quality.txt index 9949ab34..563094a2 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,8 +16,11 @@ astroid==3.1.0 # pylint-celery awscli==1.32.50 # via -r requirements/reporting.in -backports-zoneinfo==0.2.1 - # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/base.in + # -r requirements/reporting.in + # django bcrypt==4.1.2 # via paramiko billiard==3.6.4.0 diff --git a/requirements/reporting.in b/requirements/reporting.in index eef52aae..ce12c2a0 100644 --- a/requirements/reporting.in +++ b/requirements/reporting.in @@ -11,6 +11,7 @@ pyminizip # Required for Enterprise Reporting unicodecsv==0.14.1 # Allows exporting CSV with unicode support (a drop-in replacement for built-in csv module) vertica-python # Required for Enterprise Reporting snowflake-connector-python # Required for Enterprise Reporting +backports.zoneinfo;python_version<"3.9" # Can be removed once we upgrade to Python 3.12 # Official py2neo version has been removed from both PyPI/GitHub # Using the latest available fork for now unless diff --git a/requirements/test-master.txt b/requirements/test-master.txt index cdd9b523..cf0ec59f 100644 --- a/requirements/test-master.txt +++ b/requirements/test-master.txt @@ -12,8 +12,11 @@ asn1crypto==1.5.1 # via snowflake-connector-python awscli==1.32.50 # via -r requirements/reporting.in -backports-zoneinfo==0.2.1 - # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/base.in + # -r requirements/reporting.in + # django bcrypt==4.1.2 # via paramiko billiard==3.6.4.0 diff --git a/requirements/test-reporting.txt b/requirements/test-reporting.txt index 25927460..19837fbc 100644 --- a/requirements/test-reporting.txt +++ b/requirements/test-reporting.txt @@ -14,6 +14,8 @@ attrs==23.2.0 # via pytest awscli==1.32.50 # via -r requirements/reporting.in +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via -r requirements/reporting.in bcrypt==4.1.2 # via paramiko billiard==3.6.4.0 diff --git a/requirements/test.txt b/requirements/test.txt index 124df64e..fc7cb166 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,8 +12,11 @@ asn1crypto==1.5.1 # via snowflake-connector-python awscli==1.32.50 # via -r requirements/reporting.in -backports-zoneinfo==0.2.1 - # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/base.in + # -r requirements/reporting.in + # django bcrypt==4.1.2 # via paramiko billiard==3.6.4.0