test: fix tests for python upgrade and update python version for CI

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9.15"
+          python-version: "3.12.4"
           cache: "poetry"
 
       - name: Install dependencies

courses/serializers_test.py

@@ -6,6 +6,7 @@
 
 import factory
 import pytest
+import pytz
 from django.contrib.auth.models import AnonymousUser
 
 from cms.constants import FORMAT_ONLINE, FORMAT_OTHER
@@ -106,7 +107,7 @@ def test_serialize_program(  # noqa: PLR0913
 
     non_live_run = CourseRunFactory.create(
         course=course1,
-        end_date=datetime.max.astimezone(timezone.utc),
+        end_date=datetime.max.replace(tzinfo=pytz.utc),
         expiration_date=None,
         live=False,
     )

ecommerce/api_test.py

@@ -705,9 +705,9 @@ def test_get_by_reference_number(
     same_order = Order.objects.get_by_reference_number(order.reference_number)
     assert same_order.id == order.id
     if hubspot_api_key:
-        assert mock_hubspot_syncs.order.called_with(order.id)  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_called_with(order.id)  # noqa: PGH005
     else:
-        assert mock_hubspot_syncs.order.not_called()  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_not_called()  # noqa: PGH005
 
 
 def test_get_by_reference_number_missing(validated_basket):
@@ -771,9 +771,9 @@ def test_create_unfulfilled_order(  # noqa: PLR0913
         assert CouponRedemption.objects.count() == 0
 
     if hubspot_api_key:
-        assert mock_hubspot_syncs.order.called_with(order.id)  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_called_with(order.id)  # noqa: PGH005
     else:
-        assert mock_hubspot_syncs.order.not_called()  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_not_called()  # noqa: PGH005
 
 
 @pytest.mark.parametrize("has_program_run", [True, False])

ecommerce/models_test.py

@@ -253,11 +253,12 @@ def test_product_version_save_text_id_badproduct(mocker):
     """ProductVersion.text_id should None if ProductVersion.product is invalid"""
     mock_log = mocker.patch("ecommerce.models.log")
     product_version = ProductVersionFactory.create(
-        product=ProductFactory.create(content_object=LineFactory())
+        product=ProductFactory.create(content_object=LineFactory()), id=1
     )
     assert product_version.text_id is None
-    assert mock_log.called_once_with(  # noqa: PGH005
-        f"The content object for this ProductVersion ({product_version.id}) does not have a `text_id` property"
+    mock_log.error.assert_called_once_with(
+        "The content object for this ProductVersion (%s) does not have a `text_id` property",
+        str(product_version.id),
     )
 
 

ecommerce/views_test.py

@@ -225,9 +225,9 @@ def test_zero_price_checkout(  # noqa: PLR0913
     assert CourseRunSelection.objects.filter(basket__user=user).count() == 0
     assert CouponSelection.objects.filter(basket__user=user).count() == 0
     if hubspot_api_key:
-        assert mock_hubspot_syncs.order.called_with(order.id)  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_called_with(order.id)  # noqa: PGH005
     else:
-        assert mock_hubspot_syncs.order.not_called()  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_not_called()  # noqa: PGH005
 
 
 @pytest.mark.parametrize("hubspot_api_key", [None, "fake-key"])
@@ -287,9 +287,9 @@ def test_order_fulfilled(  # noqa: PLR0913
     assert CouponSelection.objects.filter(basket__user=user).count() == 0
 
     if hubspot_api_key:
-        assert mock_hubspot_syncs.order.called_with(order.id)  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_called_with(order.id)  # noqa: PGH005
     else:
-        assert mock_hubspot_syncs.order.not_called()  # noqa: PGH005
+        mock_hubspot_syncs.order.assert_not_called()  # noqa: PGH005
 
 
 def test_order_affiliate(basket_client, mocker, basket_and_coupons):

pyproject.toml

@@ -68,7 +68,7 @@ django-debug-toolbar = "*"
 factory-boy = "3.3.0"
 faker = "13.16.0"
 freezegun = "0.3.15"
-hypothesis = "4.23.4"
+hypothesis = "4.24.6"
 ipdb = "*"
 nplusone = ">=0.8.1"
 pdbpp = "*"

users/factories.py

@@ -72,7 +72,7 @@ def state_or_territory(self):
         if self.country not in {"US", "CA"}:
             return ""
         subdivisions = pycountry.subdivisions.get(country_code=self.country)
-        subdivision = random.randgen.sample(subdivisions, 1)[0]
+        subdivision = random.randgen.sample(list(subdivisions), 1)[0]
         # Example: "US-MA"  # noqa: ERA001
         return subdivision.code