diff --git a/.gitignore b/.gitignore index f3069b21..fdd42bd5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ tests/.env build dist *.egg-info -src/core/__version__.py +django_oapif/core/__version__.py tests/benchmark/results diff --git a/src/README.md b/django_oapif/README.md similarity index 100% rename from src/README.md rename to django_oapif/README.md diff --git a/src/__init__.py b/django_oapif/__init__.py similarity index 100% rename from src/__init__.py rename to django_oapif/__init__.py diff --git a/src/crs_utils.py b/django_oapif/crs_utils.py similarity index 100% rename from src/crs_utils.py rename to django_oapif/crs_utils.py diff --git a/src/decorators.py b/django_oapif/decorators.py similarity index 99% rename from src/decorators.py rename to django_oapif/decorators.py index 818d2a21..ef881ee3 100644 --- a/src/decorators.py +++ b/django_oapif/decorators.py @@ -4,11 +4,12 @@ from django.contrib.gis.geos import GEOSGeometry from django.db import models from django.db.models.functions import Cast +from rest_framework import reverse, serializers, viewsets +from rest_framework_gis.serializers import GeoFeatureModelSerializer + from django_oapif.metadata import OAPIFMetadata from django_oapif.mixins import OAPIFDescribeModelViewSetMixin from django_oapif.urls import oapif_router -from rest_framework import reverse, serializers, viewsets -from rest_framework_gis.serializers import GeoFeatureModelSerializer from .filters import BboxFilterBackend diff --git a/src/filters.py b/django_oapif/filters.py similarity index 100% rename from src/filters.py rename to django_oapif/filters.py diff --git a/src/functions.py b/django_oapif/functions.py similarity index 100% rename from src/functions.py rename to django_oapif/functions.py diff --git a/src/metadata.py b/django_oapif/metadata.py similarity index 100% rename from src/metadata.py rename to django_oapif/metadata.py diff --git a/src/mixins.py b/django_oapif/mixins.py similarity index 99% rename from src/mixins.py rename to django_oapif/mixins.py index 78354eaa..c1768b3d 100644 --- a/src/mixins.py +++ b/django_oapif/mixins.py @@ -1,8 +1,9 @@ from django.contrib.gis.db.models import Extent -from django_oapif.urls import oapif_router from pyproj import CRS, Transformer from rest_framework.response import Response +from django_oapif.urls import oapif_router + from .parsers import GeojsonParser, JSONMergePatchParser diff --git a/src/pagination.py b/django_oapif/pagination.py similarity index 100% rename from src/pagination.py rename to django_oapif/pagination.py diff --git a/src/parsers.py b/django_oapif/parsers.py similarity index 100% rename from src/parsers.py rename to django_oapif/parsers.py diff --git a/src/routers.py b/django_oapif/routers.py similarity index 100% rename from src/routers.py rename to django_oapif/routers.py diff --git a/src/urls.py b/django_oapif/urls.py similarity index 100% rename from src/urls.py rename to django_oapif/urls.py diff --git a/src/views.py b/django_oapif/views.py similarity index 100% rename from src/views.py rename to django_oapif/views.py diff --git a/pyproject.toml b/pyproject.toml index 9440feb7..300a75a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,9 @@ homepage = "https://github.com/opengisch/django-ogcapif" repository = "https://github.com/opengisch/django-ogcapif" tracker = "https://github.com/opengisch/django-ogcapif/issues" +[tool.setuptools] +packages = ["django_oapif"] + [tool.setuptools-git-versioning] enabled = true version_callback = "0.0.0.dev" diff --git a/tests/django_oapif_tests/tests/management/__init__.py b/tests/django_oapif_tests/tests/management/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/django_oapif_tests/tests/management/commands/__init__.py b/tests/django_oapif_tests/tests/management/commands/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/django_oapif_tests/tests/management/commands/populate_data.py b/tests/django_oapif_tests/tests/management/commands/populate_data.py index 96867bd7..56d03598 100644 --- a/tests/django_oapif_tests/tests/management/commands/populate_data.py +++ b/tests/django_oapif_tests/tests/management/commands/populate_data.py @@ -6,8 +6,7 @@ from django.core.management import call_command from django.core.management.base import BaseCommand from django.db import transaction - -from tests.models import ( +from django_oapif_tests.tests.models import ( Line_2056_10fields, Line_2056_10fields_local_geom, NoGeom_10fields, diff --git a/tests/django_oapif_tests/tests/settings.py b/tests/django_oapif_tests/tests/settings.py index aa3c00ca..875fbb23 100644 --- a/tests/django_oapif_tests/tests/settings.py +++ b/tests/django_oapif_tests/tests/settings.py @@ -30,12 +30,13 @@ } -ALLOWED_HOSTS = ["localhost", "django_oapif_tests", os.getenv("OGCAPIF_HOST", "")] +ALLOWED_HOSTS = ["localhost", "django", os.getenv("OGCAPIF_HOST", "")] # Application definition INSTALLED_APPS = [ + "django_oapif", "django_oapif_tests.tests", "django.contrib.admin", "django.contrib.auth", diff --git a/tests/docker-compose.dev.yml b/tests/docker-compose.dev.yml index 731aa470..371520bf 100644 --- a/tests/docker-compose.dev.yml +++ b/tests/docker-compose.dev.yml @@ -15,7 +15,7 @@ services: DJANGO_DEBUG: "true" volumes: # mounting the source code for live reloading - - ..:/usr/src + - ..:/usr/django_oapif # mounting directory to hold unit tests outputs - ./unit_tests_outputs/:/unit_tests_outputs ports: