Release 0.159.1

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
 
     services:
       db:
-        image: postgres:15.8
+        image: postgres:16.4
         # Health checks to wait until postgres has started
         options: >-
           --health-cmd pg_isready

.pre-commit-config.yaml

@@ -51,7 +51,7 @@ repos:
           - --exclude-files
           - "_test.js$"
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.6.2"
+    rev: "v0.6.5"
     hooks:
       - id: ruff-format
       - id: ruff

RELEASE.rst

@@ -1,6 +1,32 @@
 Release Notes
 =============
 
+Version 0.159.1
+---------------
+
+- fix(deps): update dependency boto3 to v1.35.21
+- [pre-commit.ci] pre-commit autoupdate (#3152)
+- fix(deps): update dependency boto3 to v1.35.19
+- chore(deps): update dependency factory-boy to v3.3.1
+- Don't fail app init if settings.py is reloaded
+- fix: don't generate report.html file for RC and Production (#3125)
+- fix(deps): update dependency express to v4.20.0 [security] (#3147)
+- chore(deps): update dependency pytest to v8 (#3141)
+- fix(deps): update dependency yup to v1 (#3061)
+- fix(deps): update dependency mocha to v10 (#3144)
+- chore(deps): update postgres docker tag to v16 (#3138)
+- Revert "fix(deps): update dependency sass to ~1.78.0" (#3145)
+- [pre-commit.ci] pre-commit autoupdate (#3142)
+- fix(deps): update dependency pycountry to v24 (#3139)
+- fix(deps): update dependency webpack-bundle-tracker to v1.8.1 (#3136)
+- fix(deps): update dependency google-api-python-client to v2.144.0
+- fix(deps): update dependency django to v4.2.16
+- fix(deps): update dependency boto3 to v1.35.14
+- fix: use support email address from configurations(settings) (#3127)
+- fix(deps): update dependency sass to ~1.78.0
+- [pre-commit.ci] pre-commit autoupdate (#3126)
+- chore(deps): update dependency ruff to ^0.6.0 (#3115)
+
 Version 0.159.0 (Released September 09, 2024)
 ---------------
 

docker-compose.yml

@@ -23,7 +23,7 @@ x-extra-hosts: &default-extra-hosts
 
 services:
   db:
-    image: postgres:15.8
+    image: postgres:16.4
     environment:
       POSTGRES_PASSWORD: postgres # pragma: allowlist secret
     ports:

ecommerce/api_test.py

@@ -110,7 +110,6 @@
 
 FAKE = faker.Factory.create()
 pytestmark = pytest.mark.django_db
-lazy = pytest.lazy_fixture
 
 CYBERSOURCE_ACCESS_KEY = "access"
 CYBERSOURCE_PROFILE_ID = "profile"

ecommerce/mail_api.py

@@ -357,6 +357,7 @@ def send_ecommerce_order_receipt(order, cyber_source_provided_email=None):
                                     "vat_id": purchaser.get("vat_id"),
                                 },
                                 "enable_taxes_display": bool(order["tax_rate"]),
+                                "email_support": settings.EMAIL_SUPPORT,
                             },
                         ),
                     )

ecommerce/mail_api_test.py

@@ -48,8 +48,6 @@
 from mitxpro.utils import format_price
 from users.factories import UserFactory
 
-lazy = pytest.lazy_fixture
-
 pytestmark = pytest.mark.django_db
 
 
@@ -346,6 +344,7 @@ def test_send_ecommerce_order_receipt(mocker, receipt_data, settings):
                 "vat_id": "AT12349876",
             },
             "enable_taxes_display": False,
+            "email_support": settings.EMAIL_SUPPORT,
         },
     )
     patched_mail_api.messages_for_recipients.assert_called_once_with(

ecommerce/views_test.py

@@ -9,6 +9,7 @@
 import pytest
 from django.db.models import Count, Q
 from django.urls import reverse
+from pytest_lazy_fixtures import lf as lazy
 from rest_framework import status
 from rest_framework.renderers import JSONRenderer
 from rest_framework.test import APIClient
@@ -70,7 +71,6 @@
 CYBERSOURCE_SECURITY_KEY = "security"
 FAKE = faker.Factory.create()
 
-lazy = pytest.lazy_fixture
 
 pytestmark = pytest.mark.django_db
 

mail/api_test.py

@@ -3,6 +3,7 @@
 from email.utils import formataddr
 
 import pytest
+from pytest_lazy_fixtures import lf as lazy
 
 from mail.api import (
     EmailMetadata,
@@ -20,7 +21,6 @@
 from users.factories import UserFactory
 
 pytestmark = [pytest.mark.django_db, pytest.mark.usefixtures("email_settings")]
-lazy = pytest.lazy_fixture
 
 
 @pytest.fixture

mail/templates/product_order_receipt/body.html

@@ -26,8 +26,8 @@
       <br />
       {% endif %}
       Support:
-      <a href="mailto:[email protected]">
-        [email protected]
+      <a href="mailto:{{ email_support }}">
+        {{ email_support }}
       </a>
       <br />
     </p>

maxmind/api_test.py

@@ -53,4 +53,4 @@ def test_ipv4_lookup(v4, in_block):
 
     result = ip_to_country_code(str(test_address))
 
-    return result is None and not in_block
+    assert (result is not None and in_block) or result is None

mitxpro/settings.py

@@ -13,21 +13,29 @@
 from celery.schedules import crontab
 from django.core.exceptions import ImproperlyConfigured
 from mitol.common.envs import (
+    env,
     get_bool,
     get_delimited_list,
     get_features,
     get_int,
     get_string,
     import_settings_modules,
 )
-from mitol.common.settings.webpack import *  # noqa: F403
-from mitol.digitalcredentials.settings import *  # noqa: F403
 from redbeat import RedBeatScheduler
 
 from mitxpro.celery_utils import OffsettingSchedule
 from mitxpro.sentry import init_sentry
 
-VERSION = "0.159.0"
+VERSION = "0.159.1"
+
+env.reset()
+
+# import_settings_module, imports the default settings defined in ol-django-authentication app
+import_settings_modules(
+    "mitol.authentication.settings.djoser_settings",
+    "mitol.common.settings.webpack",
+    "mitol.digitalcredentials.settings",
+)
 
 ENVIRONMENT = get_string(
     name="MITXPRO_ENVIRONMENT",
@@ -201,7 +209,7 @@
     INSTALLED_APPS += ("localdev.seed",)
 
 
-if not WEBPACK_DISABLE_LOADER_STATS:  # noqa: F405
+if not WEBPACK_DISABLE_LOADER_STATS:  # noqa: F821
     INSTALLED_APPS += ("webpack_loader",)
 
 MIDDLEWARE = (
@@ -1053,8 +1061,6 @@
 )
 
 # mitol-django-authenticaton
-# import_settings_module, imports the default settings defined in ol-django-authentication app
-import_settings_modules("mitol.authentication.settings.djoser_settings")
 MITOL_AUTHENTICATION_FROM_EMAIL = MAILGUN_FROM_EMAIL
 MITOL_AUTHENTICATION_REPLY_TO_EMAIL = MITXPRO_REPLY_TO_ADDRESS
 

package.json

@@ -62,7 +62,7 @@
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^0.12.0",
     "minimist": "^1.2.6",
-    "mocha": "^5.2.0",
+    "mocha": "^10.0.0",
     "named-urls": "^1.4.0",
     "nyc": "^15.1.0",
     "object.entries": "^1.0.4",
@@ -115,11 +115,11 @@
     "waait": "^1.0.4",
     "webpack": "^5.76.0",
     "webpack-bundle-analyzer": "^4.6.1",
-    "webpack-bundle-tracker": "1.4.0",
+    "webpack-bundle-tracker": "1.8.1",
     "webpack-cli": "^4.8.0",
     "webpack-dev-middleware": "^5.0.0",
     "webpack-hot-middleware": "^2.25.0",
-    "yup": "^0.31.0"
+    "yup": "^1.0.0"
   },
   "engines": {
     "node": "20.17.0"