Merge branch 'main' into DRIVERS-2917

Author: NoahStapp

.github/workflows/codeql.yml

@@ -45,18 +45,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         ref: ${{ inputs.ref }}
         persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
+      uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
       with:
         languages: ${{ matrix.language }}
         build-mode: none
@@ -72,6 +72,6 @@ jobs:
         pip install -e .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
+      uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
       with:
         category: "/language:${{ matrix.language }}"

.github/workflows/dist.yml

@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     environment: release
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ inputs.ref }}
         persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Install dependencies

.github/workflows/linters.yml

@@ -12,10 +12,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.10'
           cache: 'pip'
@@ -32,10 +32,10 @@ jobs:
     name: Docs Checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'

.github/workflows/mongodb_settings.py

@@ -1,13 +1,16 @@
 import os
 
-from django_mongodb_backend import parse_uri
+from pymongo.uri_parser import parse_uri
 
 if mongodb_uri := os.getenv("MONGODB_URI"):
-    db_settings = parse_uri(mongodb_uri, db_name="dummy")
-
+    db_settings = {
+        "ENGINE": "django_mongodb_backend",
+        "HOST": mongodb_uri,
+    }
     # Workaround for https://github.com/mongodb-labs/mongo-orchestration/issues/268
-    if db_settings["USER"] and db_settings["PASSWORD"]:
-        db_settings["OPTIONS"].update({"tls": True, "tlsAllowInvalidCertificates": True})
+    uri = parse_uri(mongodb_uri)
+    if uri.get("username") and uri.get("password"):
+        db_settings["OPTIONS"] = {"tls": True, "tlsAllowInvalidCertificates": True}
     DATABASES = {
         "default": {**db_settings, "NAME": "djangotests"},
         "other": {**db_settings, "NAME": "djangotests-other"},

.github/workflows/release-python.yml

@@ -80,14 +80,14 @@ jobs:
           name: all-dist-${{ github.run_id }}
           path: dist/
       - name: Publish package distributions to TestPyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # 1.13.0
         with:
           repository-url: https://test.pypi.org/legacy/
           skip-existing: true
           attestations: ${{ env.DRY_RUN }}
       - name: Publish package distributions to PyPI
         if: startsWith(env.DRY_RUN, 'false')
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # 1.13.0
 
   post-publish:
     needs: [publish]

.github/workflows/test-python-atlas.yml

@@ -22,15 +22,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout django-mongodb-backend
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: install django-mongodb-backend
         run: |
           pip3 install --upgrade pip
           pip3 install -e .
       - name: Checkout Django
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: 'mongodb-forks/django'
           ref: 'mongodb-5.2.x'

.github/workflows/test-python-geo.yml

@@ -23,15 +23,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout django-mongodb-backend
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: install django-mongodb-backend
         run: |
           pip3 install --upgrade pip
           pip3 install -e .
       - name: Checkout Django
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: 'mongodb-forks/django'
           ref: 'mongodb-5.2.x'

.github/workflows/test-python.yml

@@ -22,15 +22,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout django-mongodb-backend
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: install django-mongodb-backend
         run: |
           pip3 install --upgrade pip
           pip3 install -e .
       - name: Checkout Django
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: 'mongodb-forks/django'
           ref: 'mongodb-5.2.x'

.github/workflows/zizmor.yml

@@ -14,8 +14,8 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Run zizmor
-        uses: zizmorcore/zizmor-action@383d31df2eb66a2f42db98c9654bdc73231f3e3a
+        uses: zizmorcore/zizmor-action@e673c3917a1aef3c65c972347ed84ccd013ecda4 # v0.2.0

.gitignore

@@ -47,5 +47,5 @@ __pycache__
 
 # documentation build artifacts
 
-docs/build
+docs/_build
 site/