Skip to content

Commit ac5c6d6

Browse files
authored
Merge pull request #36564 from openedx/repo-tools/upgrade-python-requirements-1ac6de2
chore: Upgrade Python requirements
2 parents 3f67f3c + 8cab446 commit ac5c6d6

14 files changed

Lines changed: 368 additions & 348 deletions

File tree

openedx/core/djangoapps/user_api/tests/test_views.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django.test.utils import override_settings
66
from django.urls import reverse
77
from opaque_keys.edx.keys import CourseKey
8-
from pytz import common_timezones_set
8+
from pytz import common_timezones_set, common_timezones, country_timezones
99

1010
from openedx.core.djangoapps.django_comment_common import models
1111
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_unless_lms
@@ -634,13 +634,16 @@ def _assert_time_zone_is_valid(self, time_zone_info):
634634
assert time_zone_name in common_timezones_set
635635
assert time_zone_info['description'] == get_display_time_zone(time_zone_name)
636636

637-
# The time zones count may need to change each time we upgrade pytz
638-
@ddt.data((ALL_TIME_ZONES_URI, 432),
639-
(COUNTRY_TIME_ZONES_URI, 23))
640-
@ddt.unpack
641-
def test_get_basic(self, country_uri, expected_count):
637+
def test_get_country_timezones(self):
638+
""" Verify that correct time zone info is returned """
639+
results = self.get_json(self.COUNTRY_TIME_ZONES_URI)
640+
assert len(results) == len(country_timezones['cA'])
641+
for time_zone_info in results:
642+
self._assert_time_zone_is_valid(time_zone_info)
643+
644+
def test_get_all_common_timezones(self):
642645
""" Verify that correct time zone info is returned """
643-
results = self.get_json(country_uri)
644-
assert len(results) == expected_count
646+
results = self.get_json(self.ALL_TIME_ZONES_URI)
647+
assert len(results) == len(common_timezones)
645648
for time_zone_info in results:
646649
self._assert_time_zone_is_valid(time_zone_info)

requirements/edx-sandbox/base.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ click==8.1.8
1212
# via nltk
1313
codejail-includes==1.0.0
1414
# via -r requirements/edx-sandbox/base.in
15-
contourpy==1.3.1
15+
contourpy==1.3.2
1616
# via matplotlib
1717
cryptography==44.0.2
1818
# via -r requirements/edx-sandbox/base.in
1919
cycler==0.12.1
2020
# via matplotlib
21-
fonttools==4.56.0
21+
fonttools==4.57.0
2222
# via matplotlib
2323
joblib==1.4.2
2424
# via nltk
2525
kiwisolver==1.4.8
2626
# via matplotlib
27-
lxml[html-clean,html_clean]==5.3.1
27+
lxml[html-clean,html_clean]==5.3.2
2828
# via
2929
# -r requirements/edx-sandbox/base.in
3030
# lxml-html-clean
3131
# openedx-calc
32-
lxml-html-clean==0.4.1
32+
lxml-html-clean==0.4.2
3333
# via lxml
3434
markupsafe==3.0.2
3535
# via
@@ -53,15 +53,15 @@ numpy==1.26.4
5353
# matplotlib
5454
# openedx-calc
5555
# scipy
56-
openedx-calc==4.0.1
56+
openedx-calc==4.0.2
5757
# via -r requirements/edx-sandbox/base.in
58-
packaging==24.2
58+
packaging==25.0
5959
# via matplotlib
60-
pillow==11.1.0
60+
pillow==11.2.1
6161
# via matplotlib
6262
pycparser==2.22
6363
# via cffi
64-
pyparsing==3.2.1
64+
pyparsing==3.2.3
6565
# via
6666
# -r requirements/edx-sandbox/base.in
6767
# chem
@@ -77,7 +77,6 @@ scipy==1.15.2
7777
# via
7878
# -r requirements/edx-sandbox/base.in
7979
# chem
80-
# openedx-calc
8180
six==1.17.0
8281
# via
8382
# codejail-includes

0 commit comments

Comments
 (0)