fux

opengisch · Mar 22, 2024 · c53e2cd · c53e2cd
1 parent fa76331
commit c53e2cd
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 8 deletions.
diff --git 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 → django_oapif/README.md b/src/README.md → django_oapif/README.md
diff --git a/src/__init__.py → django_oapif/__init__.py b/src/__init__.py → django_oapif/__init__.py
diff --git a/src/crs_utils.py → django_oapif/crs_utils.py b/src/crs_utils.py → django_oapif/crs_utils.py
diff --git a/src/decorators.py → django_oapif/decorators.py b/src/decorators.py → 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 → django_oapif/filters.py b/src/filters.py → django_oapif/filters.py
diff --git a/src/functions.py → django_oapif/functions.py b/src/functions.py → django_oapif/functions.py
diff --git a/src/metadata.py → django_oapif/metadata.py b/src/metadata.py → django_oapif/metadata.py
diff --git a/src/mixins.py → django_oapif/mixins.py b/src/mixins.py → 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 → django_oapif/pagination.py b/src/pagination.py → django_oapif/pagination.py
diff --git a/src/parsers.py → django_oapif/parsers.py b/src/parsers.py → django_oapif/parsers.py
diff --git a/src/routers.py → django_oapif/routers.py b/src/routers.py → django_oapif/routers.py
diff --git a/src/urls.py → django_oapif/urls.py b/src/urls.py → django_oapif/urls.py
diff --git a/src/views.py → django_oapif/views.py b/src/views.py → django_oapif/views.py
diff --git 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/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
@@ -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
@@ -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: