diff --git a/.evergreen/config.yml b/.evergreen/config.yml index d59bfe079..40046f4a8 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -68,22 +68,22 @@ tasks: - func: "run unit tests" buildvariants: - - name: tests-6-noauth-nossl - display_name: Run Tests 6.0 NoAuth NoSSL + - name: tests-7-noauth-nossl + display_name: Run Tests 7.0 NoAuth NoSSL run_on: rhel87-small expansions: - MONGODB_VERSION: "6.0" + MONGODB_VERSION: "7.0" TOPOLOGY: server AUTH: "noauth" SSL: "nossl" tasks: - name: run-tests - - name: tests-6-auth-ssl - display_name: Run Tests 6.0 Auth SSL + - name: tests-7-auth-ssl + display_name: Run Tests 7.0 Auth SSL run_on: rhel87-small expansions: - MONGODB_VERSION: "6.0" + MONGODB_VERSION: "7.0" TOPOLOGY: server AUTH: "auth" SSL: "ssl" diff --git a/.github/workflows/test-python-geo.yml b/.github/workflows/test-python-geo.yml index e76818d7c..aeddd206f 100644 --- a/.github/workflows/test-python-geo.yml +++ b/.github/workflows/test-python-geo.yml @@ -53,7 +53,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@315db7fe45ac2880b7758f1933e6e5d59afd5e94 # 1.12.1 with: - mongodb-version: 6.0 + mongodb-version: 7.0 - name: Run tests run: python3 django_repo/tests/runtests_.py permissions: diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 19173239a..584117622 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -52,7 +52,7 @@ jobs: - name: Start MongoDB uses: supercharge/mongodb-github-action@315db7fe45ac2880b7758f1933e6e5d59afd5e94 # 1.12.1 with: - mongodb-version: 6.0 + mongodb-version: 7.0 - name: Run tests run: python3 django_repo/tests/runtests_.py permissions: diff --git a/django_mongodb_backend/features.py b/django_mongodb_backend/features.py index 265ed3a5c..e5f0b2cf2 100644 --- a/django_mongodb_backend/features.py +++ b/django_mongodb_backend/features.py @@ -12,7 +12,7 @@ class GISFeatures: class DatabaseFeatures(GISFeatures, BaseDatabaseFeatures): - minimum_database_version = (6, 0) + minimum_database_version = (7, 0) allow_sliced_subqueries_with_in = False allows_multiple_constraints_on_same_fields = False can_create_inline_fk = False @@ -107,22 +107,11 @@ class DatabaseFeatures(GISFeatures, BaseDatabaseFeatures): "contenttypes_tests.test_order_with_respect_to.OrderWithRespectToGFKTests.test_bulk_create_respects_mixed_manual_order", "contenttypes_tests.test_order_with_respect_to.OrderWithRespectToGFKTests.test_bulk_create_with_existing_children", } - # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3. - _django_test_expected_failures_bitwise = { - "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_and", - "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_or", - "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor", - "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor_null", - "expressions.tests.ExpressionOperatorTests.test_lefthand_bitwise_xor_right_null", - "expressions.tests.ExpressionOperatorTests.test_lefthand_transformed_field_bitwise_or", - } @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.is_mongodb_6_3: - expected_failures.update(self._django_test_expected_failures_bitwise) return expected_failures _django_test_skips = { diff --git a/docs/releases/6.0.x.rst b/docs/releases/6.0.x.rst index 38209a143..57fd691d2 100644 --- a/docs/releases/6.0.x.rst +++ b/docs/releases/6.0.x.rst @@ -18,3 +18,4 @@ Backwards incompatible changes - ``django_mongodb_backend.utils.parse_uri()`` is removed as per the :ref:`deprecation timeline `. +- The minimum supported version of MongoDB is increased from 6.0 to 7.0.