Merge branch 'master' into ci2

* master:
  No need to test pre-releases in merge to main branch
  Switch to audit mode; we're killing the deploy step
  DOn't use HTTPS for jquery resources because the CDN is  broken for HTTP/2.
  [pre-commit.ci] pre-commit autoupdate (#1175)
  Bump hypothesis from 6.100.0 to 6.100.1 (#1173)
  Bump zope-interface from 6.2 to 6.3 (#1174)
  Bump sphinx-autobuild from 2024.2.4 to 2024.4.13 (#1172)
  Bump python from 3.12.2-alpine3.18 to 3.12.3-alpine3.18 (#1171)
  Bump idna from 3.6 to 3.7 in /requirements (#1170)
  [pre-commit.ci] pre-commit autoupdate (#1169)
  Bump typing-extensions from 4.10.0 to 4.11.0 (#1167)
  Bump werkzeug from 3.0.1 to 3.0.2 (#1168)
  Bump pyasn1 from 0.5.1 to 0.6.0 (#1161)
  Bump hypothesis from 6.99.13 to 6.100.0 (#1160)
  Bump pyasn1-modules from 0.3.0 to 0.4.0 (#1159)
  Bump pycparser from 2.21 to 2.22 (#1158)
  Bump codecov/codecov-action from 3 to 4 (#1138)

.github/workflows/cicd.yml

@@ -213,6 +213,7 @@ jobs:
             python-version: "3.13.0-alpha.3"
             optional: true
             tox-prefix: "test"
+            if: github.ref != 'refs/heads/master'
 
     services:
       mysql:
@@ -330,7 +331,7 @@ jobs:
           python-version: "3.12"
 
       - name: "Upload coverage to Codecov"
-        uses: "codecov/codecov-action@v3"
+        uses: "codecov/codecov-action@v4"
         if: ${{ matrix.tox-prefix == 'coverage' }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -511,7 +512,7 @@ jobs:
       - name: Harden CI
         uses: step-security/[email protected]
         with:
-          egress-policy: block
+          egress-policy: audit
 
       - name: Checkout source code
         uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         args: ["--py312-plus"]
 
   - repo: https://github.com/psf/black
-    rev: "24.3.0"
+    rev: "24.4.0"
     hooks:
       - id: black
         args: ["--target-version", "py312"]
@@ -62,7 +62,7 @@ repos:
       args: ["--filter-files"]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v4.5.0"
+    rev: "v4.6.0"
     hooks:
       - id: check-ast
       - id: check-builtin-literals

Dockerfile

@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 # This stage builds the build container.
 # -----------------------------------------------------------------------------
-FROM python:3.12.2-alpine3.18 as build
+FROM python:3.12.3-alpine3.18 as build
 
 # Install compiler toolchain and libraries.
 RUN apk add --no-cache build-base libffi-dev libressl-dev
@@ -35,7 +35,7 @@ RUN "${IMS_INSTALL_DIR}/bin/pip" --no-cache-dir install "${IMS_SOURCE_DIR}"
 # -----------------------------------------------------------------------------
 # This stage builds the application container.
 # -----------------------------------------------------------------------------
-FROM python:3.12.2-alpine3.18 as application
+FROM python:3.12.3-alpine3.18 as application
 
 # Paths
 ARG IMS_INSTALL_DIR="/opt/ims"

requirements/requirements-direct.txt

@@ -11,5 +11,5 @@ pyOpenSSL==24.1.0
 PyYAML==6.0.1
 service-identity==24.1.0
 Twisted==24.3.0
-Werkzeug==3.0.1
-zope.interface==6.2
+Werkzeug==3.0.2
+zope.interface==6.3

requirements/requirements-docs.txt

@@ -1,3 +1,3 @@
 furo==2024.1.29
 Sphinx==7.2.6
-sphinx-autobuild==2024.2.4
+sphinx-autobuild==2024.4.13

requirements/requirements-indirect.txt

@@ -5,19 +5,19 @@ charset-normalizer==3.3.2
 constantly==23.10.4
 Deprecated==1.2.14
 exceptiongroup==1.2.0
-idna==3.6
+idna==3.7
 incremental==22.10.0
 MarkupSafe==2.1.5
 packaging==24.0
-pyasn1==0.5.1
-pyasn1-modules==0.3.0
-pycparser==2.21
+pyasn1==0.6.0
+pyasn1-modules==0.4.0
+pycparser==2.22
 pyparsing==3.1.2
 python-dateutil==2.9.0.post0
 six==1.16.0
 sortedcontainers==2.4.0
 Tubes==0.2.1
-typing_extensions==4.10.0
+typing_extensions==4.11.0
 urllib3==2.2.1
 websocket-client==1.7.0
 wrapt==1.16.0

requirements/requirements-tests.txt

@@ -1,3 +1,3 @@
 docker==7.0.0
-hypothesis==6.99.13
+hypothesis==6.100.1
 mock==5.1.0

src/ims/application/_external.py

@@ -698,11 +698,11 @@ class ExternalApplication:
     )
 
     jqueryJSSourceURL = URL.fromText(
-        f"https://code.jquery.com/{jqueryVersion}.min.js"
+        f"http://code.jquery.com/{jqueryVersion}.min.js"
     )
 
     jqueryMapSourceURL = URL.fromText(
-        f"https://code.jquery.com/{jqueryVersion}.min.map"
+        f"http://code.jquery.com/{jqueryVersion}.min.map"
     )
 
     dataTablesSourceURL = URL.fromText(