Commit 6b6d13bf authored by Claude Paroz's avatar Claude Paroz
Browse files

Stopped conditional discovery of gis_tests apps 

Refs #23879.
parent 8097e548

tests/gis_tests/admin.py

0 → 100644
+6 −0
Original line number Diff line number Diff line 
try:

    from django.contrib.gis import admin

except ImportError:

    from django.contrib import admin



    admin.OSMGeoAdmin = admin.ModelAdmin

tests/gis_tests/distapp/models.py

+2 −1
Original line number Diff line number Diff line 
from django.contrib.gis.db import models

from django.utils.encoding import python_2_unicode_compatible



from ..models import models

from ..utils import gisfield_may_be_null
@@ -12,6 +12,7 @@ class NamedModel(models.Model): 


    class Meta:

        abstract = True

        required_db_features = ['gis_enabled']



    def __str__(self):

        return self.name

tests/gis_tests/geo3d/models.py

+4 −1
Original line number Diff line number Diff line 
from django.contrib.gis.db import models

from django.utils.encoding import python_2_unicode_compatible



from ..models import models





@python_2_unicode_compatible

class NamedModel(models.Model):
@@ -10,6 +11,7 @@ class NamedModel(models.Model): 


    class Meta:

        abstract = True

        required_db_features = ['gis_enabled']



    def __str__(self):

        return self.name
@@ -49,6 +51,7 @@ class SimpleModel(models.Model): 


    class Meta:

        abstract = True

        required_db_features = ['gis_enabled']





class Point2D(SimpleModel):

tests/gis_tests/geoadmin/models.py

+4 −2
Original line number Diff line number Diff line 
from django.contrib.gis import admin

from django.contrib.gis.db import models

from django.utils.encoding import python_2_unicode_compatible



from ..admin import admin

from ..models import models





@python_2_unicode_compatible

class City(models.Model):
@@ -12,6 +13,7 @@ class City(models.Model): 


    class Meta:

        app_label = 'geoadmin'

        required_db_features = ['gis_enabled']



    def __str__(self):

        return self.name

tests/gis_tests/geoapp/models.py

+12 −1
Original line number Diff line number Diff line 
from django.contrib.gis.db import models

from django.utils.encoding import python_2_unicode_compatible



from ..models import models

from ..utils import gisfield_may_be_null
@@ -12,6 +12,7 @@ class NamedModel(models.Model): 


    class Meta:

        abstract = True

        required_db_features = ['gis_enabled']



    def __str__(self):

        return self.name
@@ -26,6 +27,7 @@ class City(NamedModel): 


    class Meta:

        app_label = 'geoapp'

        required_db_features = ['gis_enabled']





# This is an inherited model from City
@@ -39,6 +41,7 @@ class PennsylvaniaCity(City): 


    class Meta:

        app_label = 'geoapp'

        required_db_features = ['gis_enabled']





class State(NamedModel):
@@ -46,6 +49,7 @@ class State(NamedModel): 


    class Meta:

        app_label = 'geoapp'

        required_db_features = ['gis_enabled']





class Track(NamedModel):
@@ -59,6 +63,7 @@ class MultiFields(NamedModel): 


    class Meta:

        unique_together = ('city', 'point')

        required_db_features = ['gis_enabled']





class Truth(models.Model):
@@ -66,6 +71,9 @@ class Truth(models.Model): 


    objects = models.GeoManager()



    class Meta:

        required_db_features = ['gis_enabled']





class Feature(NamedModel):

    geom = models.GeometryField()
@@ -76,6 +84,9 @@ class MinusOneSRID(models.Model): 


    objects = models.GeoManager()



    class Meta:

        required_db_features = ['gis_enabled']





class NonConcreteField(models.IntegerField):