Merge branch 'main' into revised-readme

Author: Jibola

.evergreen/config.yml

@@ -31,21 +31,20 @@ functions:
     - command: subprocess.exec
       params:
         binary: bash
-        env:
-          MONGODB_VERSION: "5.0"
-          TOPOLOGY: server
-          AUTH: "noauth"
-          SSL: "nossl"
+        add_expansions_to_env: true
         args:
           - ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+    - command: expansions.update
+      params:
+        file: mo-expansion.yml
 
   "run unit tests":
     - command: subprocess.exec
       type: test
       params:
         binary: bash
         working_dir: "src"
-        include_expansions_in_env: ["DRIVERS_TOOLS"]
+        include_expansions_in_env: ["DRIVERS_TOOLS", "MONGODB_URI"]
         args:
           - ./.evergreen/run-tests.sh
 
@@ -64,13 +63,51 @@ post:
   - func: teardown
 
 tasks:
-- name: run-tests
-  commands:
-    - func: "run unit tests"
+  - name: run-tests
+    commands:
+      - func: "run unit tests"
 
 buildvariants:
-- name: tests
-  display_name: Run Tests
-  run_on: rhel87-small
-  tasks:
-  - name: run-tests
+  - name: tests-5-noauth-nossl
+    display_name: Run Tests 6.0 NoAuth NoSSL
+    run_on: rhel87-small
+    expansions:
+      MONGODB_VERSION: "6.0"
+      TOPOLOGY: server
+      AUTH: "noauth"
+      SSL: "nossl"
+    tasks:
+      - name: run-tests
+
+  - name: tests-5-auth-ssl
+    display_name: Run Tests 6.0 Auth SSL
+    run_on: rhel87-small
+    expansions:
+      MONGODB_VERSION: "6.0"
+      TOPOLOGY: server
+      AUTH: "auth"
+      SSL: "ssl"
+    tasks:
+      - name: run-tests
+
+  - name: tests-8-noauth-nossl
+    display_name: Run Tests 8.0 NoAuth NoSSL
+    run_on: rhel87-small
+    expansions:
+      MONGODB_VERSION: "8.0"
+      TOPOLOGY: server
+      AUTH: "noauth"
+      SSL: "nossl"
+    tasks:
+      - name: run-tests
+
+  - name: tests-8-auth-ssl
+    display_name: Run Tests 8.0 Auth SSL
+    run_on: rhel87-small
+    expansions:
+      MONGODB_VERSION: "8.0"
+      TOPOLOGY: server
+      AUTH: "auth"
+      SSL: "ssl"
+    tasks:
+      - name: run-tests

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ on:
 
 jobs:
   analyze:
-    name: Analyze
+    name: Analyze ${{ matrix.language }}
     runs-on: ubuntu-latest
     timeout-minutes: 360
     permissions:
@@ -36,6 +36,12 @@ jobs:
       packages: read
       actions: read
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: python
+        - language: actions
 
     steps:
     - name: Checkout repository
@@ -52,7 +58,7 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
-        languages: python
+        languages: ${{ matrix.language }}
         build-mode: none
         # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         queries: security-extended
@@ -62,10 +68,11 @@ jobs:
             - 'tests/**'
 
     - shell: bash
+      if: matrix.language == 'python'
       run: |
         pip install -e .
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
       with:
-        category: "/language:python"
+        category: "/language:${{ matrix.language }}"

.github/workflows/mongodb_settings.py

@@ -1,13 +1,29 @@
-DATABASES = {
-    "default": {
-        "ENGINE": "django_mongodb_backend",
-        "NAME": "djangotests",
-    },
-    "other": {
-        "ENGINE": "django_mongodb_backend",
-        "NAME": "djangotests-other",
-    },
-}
+import os
+
+from django_mongodb_backend import parse_uri
+
+if mongodb_uri := os.getenv("MONGODB_URI"):
+    db_settings = parse_uri(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})
+    DATABASES = {
+        "default": {**db_settings, "NAME": "djangotests"},
+        "other": {**db_settings, "NAME": "djangotests-other"},
+    }
+else:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django_mongodb_backend",
+            "NAME": "djangotests",
+        },
+        "other": {
+            "ENGINE": "django_mongodb_backend",
+            "NAME": "djangotests-other",
+        },
+    }
+
 DEFAULT_AUTO_FIELD = "django_mongodb_backend.fields.ObjectIdAutoField"
 PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",)
 SECRET_KEY = "django_tests_secret_key"

.github/workflows/release-python.yml

@@ -13,13 +13,19 @@ on:
         description: "Dry Run?"
         default: false
         type: boolean
+  schedule:
+    - cron:  '30 5 * * *'
 
 env:
   # Changes per repo
   PRODUCT_NAME: django-mongodb-backend
   # Changes per branch
   SILK_ASSET_GROUP: django-mongodb-backend-main
   EVERGREEN_PROJECT: django-mongodb-backend
+  # Constant
+  DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && inputs.dry_run || 'true' }}
+  FOLLOWING_VERSION: ${{ inputs.following_version || '' }}
+  VERSION: ${{ inputs.version || '10.10.10.10' }}
 
 defaults:
   run:
@@ -48,8 +54,8 @@ jobs:
       - uses: mongodb-labs/drivers-github-tools/python/pre-publish@v2
         id: pre-publish
         with:
-          version: ${{ inputs.version }}
-          dry_run: ${{ inputs.dry_run }}
+          version: ${{ env.VERSION }}
+          dry_run: ${{ env.DRY_RUN }}
 
   build-dist:
     needs: [pre-publish]
@@ -76,8 +82,14 @@ jobs:
         with:
           name: all-dist-${{ github.run_id }}
           path: dist/
+      - name: Publish package distributions to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+          skip-existing: true
+          attestations: ${{ env.DRY_RUN }}
       - name: Publish package distributions to PyPI
-        if: startsWith(inputs.dry_run, 'false')
+        if: startsWith(env.DRY_RUN, 'false')
         uses: pypa/gh-action-pypi-publish@release/v1
 
   post-publish:
@@ -102,11 +114,10 @@ jobs:
           artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }}
       - uses: mongodb-labs/drivers-github-tools/python/post-publish@v2
         with:
-          version: ${{ inputs.version }}
-          following_version: ${{ inputs.following_version }}
+          version: ${{ env.VERSION }}
+          following_version: ${{ env.FOLLOWING_VERSION }}
           product_name: ${{ env.PRODUCT_NAME }}
           silk_asset_group: ${{ env.SILK_ASSET_GROUP }}
           evergreen_project: ${{ env.EVERGREEN_PROJECT }}
           token: ${{ github.token }}
-          repository_url: https://test.pypi.org/legacy/
-          dry_run: ${{ inputs.dry_run }}
+          dry_run: ${{ env.DRY_RUN }}

.github/workflows/test-python.yml

@@ -52,6 +52,6 @@ jobs:
       - name: Start MongoDB
         uses: supercharge/[email protected]
         with:
-          mongodb-version: 5.0
+          mongodb-version: 6.0
       - name: Run tests
         run: python3 django_repo/tests/runtests_.py

django_mongodb_backend/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.0.0a4.dev0"
+__version__ = "5.0.0a3"
 
 # Check Django compatibility before other imports which may fail if the
 # wrong version of Django is installed.

django_mongodb_backend/compiler.py

@@ -53,7 +53,7 @@ def _get_column_from_expression(self, expr, alias):
         Create a column named `alias` from the given expression to hold the
         aggregate value.
         """
-        column_target = expr.output_field.__class__()
+        column_target = expr.output_field.clone()
         column_target.db_column = alias
         column_target.set_attributes_from_name(alias)
         return Col(self.collection_name, column_target)
@@ -81,7 +81,7 @@ def _prepare_expressions_for_pipeline(self, expression, target, annotation_group
             alias = (
                 f"__aggregation{next(annotation_group_idx)}" if sub_expr != expression else target
             )
-            column_target = sub_expr.output_field.__class__()
+            column_target = sub_expr.output_field.clone()
             column_target.db_column = alias
             column_target.set_attributes_from_name(alias)
             inner_column = Col(self.collection_name, column_target)

django_mongodb_backend/features.py

@@ -1,11 +1,9 @@
-import operator
-
 from django.db.backends.base.features import BaseDatabaseFeatures
 from django.utils.functional import cached_property
 
 
 class DatabaseFeatures(BaseDatabaseFeatures):
-    minimum_database_version = (5, 0)
+    minimum_database_version = (6, 0)
     allow_sliced_subqueries_with_in = False
     allows_multiple_constraints_on_same_fields = False
     can_create_inline_fk = False
@@ -24,10 +22,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_expression_indexes = False
     supports_foreign_keys = False
     supports_ignore_conflicts = False
-    # Before MongoDB 6.0, $in cannot be used in partialFilterExpression.
-    supports_in_index_operator = property(operator.attrgetter("is_mongodb_6_0"))
-    # Before MongoDB 6.0, $or cannot be used in partialFilterExpression.
-    supports_or_index_operator = property(operator.attrgetter("is_mongodb_6_0"))
     supports_json_field_contains = False
     # BSON Date type doesn't support microsecond precision.
     supports_microsecond_precision = False
@@ -97,16 +91,11 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor_right_null",
         "expressions.tests.ExpressionOperatorTests.test_lefthand_transformed_field_bitwise_or",
     }
-    _django_test_expected_failures_partial_expression_in = {
-        "schema.tests.SchemaTests.test_remove_ignored_unique_constraint_not_create_fk_index",
-    }
 
     @cached_property
     def django_test_expected_failures(self):
         expected_failures = super().django_test_expected_failures
         expected_failures.update(self._django_test_expected_failures)
-        if not self.supports_in_index_operator:
-            expected_failures.update(self._django_test_expected_failures_partial_expression_in)
         if not self.is_mongodb_6_3:
             expected_failures.update(self._django_test_expected_failures_bitwise)
         return expected_failures
@@ -601,10 +590,6 @@ def django_test_expected_failures(self):
         },
     }
 
-    @cached_property
-    def is_mongodb_6_0(self):
-        return self.connection.get_database_version() >= (6, 0)
-
     @cached_property
     def is_mongodb_6_3(self):
         return self.connection.get_database_version() >= (6, 3)