move to single package

timgraham · timgraham · commit d7da67c07c95 · 2025-07-26T19:14:43.000-04:00
diff --git a/.github/workflows/runtests.py b/.github/workflows/runtests.py
@@ -3,6 +3,8 @@
 import pathlib
 import sys
 
+from django.core.exceptions import ImproperlyConfigured
+
 test_apps = [
     "admin_changelist",
     "admin_checks",
@@ -157,6 +159,15 @@
         ]
     ),
 ]
+
+try:
+    from django.contrib.gis.gdal import GDAL_VERSION  # noqa: F401
+except ImproperlyConfigured:
+    # GDAL not installed.
+    pass
+else:
+    test_apps.append("gis_tests")
+
 runtests = pathlib.Path(__file__).parent.resolve() / "runtests.py"
 run_tests_cmd = f"python3 {runtests} %s --settings mongodb_settings -v 2"
 
diff --git a/.github/workflows/test-python-atlas-geo.yml b/.github/workflows/test-python-atlas-geo.yml
@@ -0,0 +1,56 @@
+name: Python Tests on Atlas
+
+on:
+  pull_request:
+      paths:
+      - '**.py'
+      - '!setup.py'
+      - '.github/workflows/test-python-atlas.yml'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash -eux {0}
+
+jobs:
+  build:
+    name: Django Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout django-mongodb-backend
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: install django-mongodb-backend
+        run: |
+          pip3 install --upgrade pip
+          pip3 install -e .
+      - name: Checkout Django
+        uses: actions/checkout@v4
+        with:
+          repository: 'mongodb-forks/django'
+          ref: 'mongogis'
+          path: 'django_repo'
+          persist-credentials: false
+      - name: Install system packages for Django's Python test dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gdal-bin libmemcached-dev
+      - name: Install Django and its Python test dependencies
+        run: |
+          cd django_repo/tests/
+          pip3 install -e ..
+          pip3 install -r requirements/py3.txt
+      - name: Copy the test settings file
+        run: cp .github/workflows/mongodb_settings.py django_repo/tests/
+      - name: Copy the test runner file
+        run: cp .github/workflows/runtests.py django_repo/tests/runtests_.py
+      - name: Start local Atlas
+        working-directory: .
+        run: bash .github/workflows/start_local_atlas.sh mongodb/mongodb-atlas-local:7
+      - name: Run tests
+        run: python3 django_repo/tests/runtests.py --settings mongodb_settings -v 2
diff --git a/.github/workflows/test-python-geo.yml b/.github/workflows/test-python-geo.yml
@@ -0,0 +1,57 @@
+name: Python Tests with GeoDjango
+
+on:
+  pull_request:
+      paths:
+      - '**.py'
+      - '!setup.py'
+      - '.github/workflows/test-python.yml'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash -eux {0}
+
+jobs:
+  build:
+    name: Django Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout django-mongodb-backend
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: install django-mongodb-backend
+        run: |
+          pip3 install --upgrade pip
+          pip3 install -e .
+      - name: Checkout Django
+        uses: actions/checkout@v4
+        with:
+          repository: 'mongodb-forks/django'
+          ref: 'mongogis'
+          path: 'django_repo'
+          persist-credentials: false
+      - name: Install system packages for Django's Python test dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gdal-bin libmemcached-dev
+      - name: Install Django and its Python test dependencies
+        run: |
+          cd django_repo/tests/
+          pip3 install -e ..
+          pip3 install -r requirements/py3.txt
+      - name: Copy the test settings file
+        run: cp .github/workflows/mongodb_settings.py django_repo/tests/
+      - name: Copy the test runner file
+        run: cp .github/workflows/runtests.py django_repo/tests/runtests_.py
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # 1.12.0
+        with:
+          mongodb-version: 6.0
+      - name: Run tests
+        run: python3 django_repo/tests/runtests_.py
diff --git a/django_mongodb_backend/features.py b/django_mongodb_backend/features.py
@@ -1,9 +1,17 @@
+from django.core.exceptions import ImproperlyConfigured
 from django.db.backends.base.features import BaseDatabaseFeatures
 from django.utils.functional import cached_property
 from pymongo.errors import OperationFailure
 
+try:
+    from .gis.features import GISFeatures
+except ImproperlyConfigured:
+    # GIS libraries not installed
+    class GISFeatures:
+        pass
 
-class DatabaseFeatures(BaseDatabaseFeatures):
+
+class DatabaseFeatures(GISFeatures, BaseDatabaseFeatures):
     minimum_database_version = (6, 0)
     allow_sliced_subqueries_with_in = False
     allows_multiple_constraints_on_same_fields = False
@@ -135,7 +143,7 @@ def django_test_expected_failures(self):
             expected_failures.update(self._django_test_expected_failures_no_transactions)
         return expected_failures
 
-    django_test_skips = {
+    _django_test_skips = {
         "Database defaults aren't supported by MongoDB.": {
             # bson.errors.InvalidDocument: cannot encode object:
             # <django.db.models.expressions.DatabaseDefault
@@ -588,6 +596,12 @@ def django_test_expected_failures(self):
         },
     }
 
+    @cached_property
+    def django_test_skips(self):
+        skips = super().django_test_skips
+        skips.update(self._django_test_skips)
+        return skips
+
     @cached_property
     def is_mongodb_6_3(self):
         return self.connection.get_database_version() >= (6, 3)
diff --git a/django_mongodb_backend/gis/__init__.py b/django_mongodb_backend/gis/__init__.py
@@ -0,0 +1,9 @@
+from django.core.exceptions import ImproperlyConfigured
+
+try:
+    from .lookups import register_lookups
+except ImproperlyConfigured:
+    # GIS libraries not installed
+    pass
+else:
+    register_lookups()
diff --git a/django_mongodb_backend/gis/adapter.py b/django_mongodb_backend/gis/adapter.py
diff --git a/django_mongodb_backend/gis/features.py b/django_mongodb_backend/gis/features.py
@@ -1,10 +1,8 @@
 from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures
 from django.utils.functional import cached_property
 
-from django_mongodb_backend.features import DatabaseFeatures as MongoFeatures
 
-
-class DatabaseFeatures(BaseSpatialFeatures, MongoFeatures):
+class GISFeatures(BaseSpatialFeatures):
     has_spatialrefsys_table = False
     supports_transform = False
 
@@ -18,20 +16,16 @@ def django_test_expected_failures(self):
                 "gis_tests.geoapp.tests.GeoModelTest.test_proxy",
                 # MongoDB does not support the within lookup
                 "gis_tests.relatedapp.tests.RelatedGeoModelTest.test06_f_expressions",
+                "gis_tests.geoapp.tests.GeoModelTest.test_gis_query_as_string",
                 # 'Adapter' object has no attribute 'srid'
                 "gis_tests.geoapp.test_expressions.GeoExpressionsTests.test_geometry_value_annotation",
                 # Object of type ObjectId is not JSON serializable
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_fields_option",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_geometry_field_option",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_serialization_base",
                 "gis_tests.geoapp.test_serializers.GeoJSONSerializerTests.test_srid_option",
-                # KeyError: 'within' connection.ops.gis_operators[self.lookup_name]
-                "gis_tests.geoapp.tests.GeoModelTest.test_gis_query_as_string",
                 # No lookups are supported (yet?)
                 "gis_tests.geoapp.tests.GeoLookupTest.test_gis_lookups_with_complex_expressions",
-                # Trying to remove spatial index fails:
-                # "index not found with name [gis_neighborhood_geom_id]"
-                "gis_tests.gis_migrations.test_operations.OperationTests.test_alter_field_remove_spatial_index",
             }
         )
         return expected_failures
@@ -62,6 +56,10 @@ def django_test_skips(self):
                     # migrations don't need to call it, so the check doesn't happen.
                     "gis_tests.gis_migrations.test_operations.NoRasterSupportTests",
                 },
+                "MongoDB doesn't support redundant spatial indexes.": {
+                    # Error: Index already exists with a different name
+                    "gis_tests.geoapp.test_indexes.SchemaIndexesTests.test_index_name",
+                },
             },
         )
         return skips
diff --git a/django_mongodb_backend/gis/lookups.py b/django_mongodb_backend/gis/lookups.py
diff --git a/django_mongodb_backend/gis/operations.py b/django_mongodb_backend/gis/operations.py
@@ -2,14 +2,10 @@
 from django.contrib.gis.db import models
 from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations
 
-from django_mongodb_backend.operations import (
-    DatabaseOperations as MongoOperations,
-)
-
 from .adapter import Adapter
 
 
-class DatabaseOperations(BaseSpatialOperations, MongoOperations):
+class GISOperations(BaseSpatialOperations):
     Adapter = Adapter
 
     disallowed_aggregates = (
diff --git a/django_mongodb_backend/gis/schema.py b/django_mongodb_backend/gis/schema.py
@@ -1,10 +1,8 @@
 from pymongo import GEOSPHERE
 from pymongo.operations import IndexModel
 
-from django_mongodb_backend.schema import DatabaseSchemaEditor as BaseSchemaEditor
 
-
-class DatabaseSchemaEditor(BaseSchemaEditor):
+class GISSchemaEditor:
     def _field_should_be_indexed(self, model, field):
         if getattr(field, "spatial_index", False):
             return True
diff --git a/django_mongodb_backend/operations.py b/django_mongodb_backend/operations.py
@@ -6,6 +6,7 @@
 
 from bson.decimal128 import Decimal128
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.db import DataError
 from django.db.backends.base.operations import BaseDatabaseOperations
 from django.db.models import TextField
@@ -14,8 +15,15 @@
 from django.utils import timezone
 from django.utils.regex_helper import _lazy_re_compile
 
+try:
+    from .gis.operations import GISOperations
+except ImproperlyConfigured:
+    # GIS libraries not installed
+    class GISOperations:
+        pass
 
-class DatabaseOperations(BaseDatabaseOperations):
+
+class DatabaseOperations(GISOperations, BaseDatabaseOperations):
     compiler_module = "django_mongodb_backend.compiler"
     combine_operators = {
         Combinable.ADD: "add",
diff --git a/django_mongodb_backend/schema.py b/django_mongodb_backend/schema.py
@@ -5,6 +5,7 @@
 from django_mongodb_backend.indexes import SearchIndex
 
 from .fields import EmbeddedModelField
+from .gis.schema import GISSchemaEditor
 from .query import wrap_database_errors
 from .utils import OperationCollector
 
@@ -27,7 +28,7 @@ def wrapper(self, model, *args, **kwargs):
     return wrapper
 
 
-class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
+class DatabaseSchemaEditor(GISSchemaEditor, BaseDatabaseSchemaEditor):
     def get_collection(self, name):
         if self.collect_sql:
             return OperationCollector(self.collected_sql, collection=self.connection.database[name])
diff --git a/django_mongodb_backend_gis/__init__.py b/django_mongodb_backend_gis/__init__.py
diff --git a/django_mongodb_backend_gis/base.py b/django_mongodb_backend_gis/base.py
