Restructure

girder · Mar 22, 2022 · 16364e5 · 16364e5
1 parent d1afabf
commit 16364e5
Show file tree

Hide file tree

Showing 49 changed files with 56 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -121,3 +121,5 @@ dmypy.json
 .pyre/
 
 # End of https://www.gitignore.io/api/django
+
+.ipynb_checkpoints
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 # Include any data files such as templates or static assets in the source distribution
-graft example
+graft django_large_image/static
+graft django_large_image/templates
diff --git a/dev/django.Dockerfile b/dev/django.Dockerfile
@@ -15,11 +15,12 @@ ENV PYTHONUNBUFFERED 1
 # but find_packages() will find nothing (which is fine). When Docker Compose mounts the real source
 # over top of this directory, the .egg-link in site-packages resolves to the mounted directory
 # and all package modules are importable.
-COPY ./django-large-image/setup.py /opt/django-project/django-large-image/setup.py
+COPY ./project/setup.py /opt/django-project/project/setup.py
 COPY ./setup.py /opt/django-project/setup.py
 
-RUN pip install --editable /opt/django-project/django-large-image[dev,colormaps]
-RUN pip install --find-links https://girder.github.io/large_image_wheels --editable /opt/django-project[dev]
+RUN pip install --find-links https://girder.github.io/large_image_wheels \
+  --editable /opt/django-project[dev,colormaps] \
+  --editable /opt/django-project/project[dev]
 
 # Use a directory name which will never be an import name, as isort considers this as first-party.
 WORKDIR /opt/django-project
diff --git a/...arge-image/django_large_image/__init__.py → django_large_image/__init__.py b/...arge-image/django_large_image/__init__.py → django_large_image/__init__.py
diff --git a/...go-large-image/django_large_image/apps.py → django_large_image/apps.py b/...go-large-image/django_large_image/apps.py → django_large_image/apps.py
diff --git a/...image/django_large_image/rest/__init__.py → django_large_image/rest/__init__.py b/...image/django_large_image/rest/__init__.py → django_large_image/rest/__init__.py
diff --git a/...ge-image/django_large_image/rest/tiles.py → django_large_image/rest/tiles.py b/...ge-image/django_large_image/rest/tiles.py → django_large_image/rest/tiles.py
diff --git a/...age/static/django_large_image/js/geojs.js → ...age/static/django_large_image/js/geojs.js b/...age/static/django_large_image/js/geojs.js → ...age/static/django_large_image/js/geojs.js
diff --git a/...ic/django_large_image/js/geojsControls.js → ...ic/django_large_image/js/geojsControls.js b/...ic/django_large_image/js/geojsControls.js → ...ic/django_large_image/js/geojsControls.js
diff --git a/...tatic/django_large_image/styles/geojs.css → ...tatic/django_large_image/styles/geojs.css b/...tatic/django_large_image/styles/geojs.css → ...tatic/django_large_image/styles/geojs.css
diff --git a/...tatic/django_large_image/styles/style.css → ...tatic/django_large_image/styles/style.css b/...tatic/django_large_image/styles/style.css → ...tatic/django_large_image/styles/style.css
diff --git a/...s/django_large_image/_include/colors.html → ...s/django_large_image/_include/colors.html b/...s/django_large_image/_include/colors.html → ...s/django_large_image/_include/colors.html
diff --git a/...es/django_large_image/_include/geojs.html → ...es/django_large_image/_include/geojs.html b/...es/django_large_image/_include/geojs.html → ...es/django_large_image/_include/geojs.html
diff --git a/...o_large_image/_include/geojsControls.html → ...o_large_image/_include/geojsControls.html b/...o_large_image/_include/geojsControls.html → ...o_large_image/_include/geojsControls.html
diff --git a/...ngo_large_image/_include/imageViewer.html → ...ngo_large_image/_include/imageViewer.html b/...ngo_large_image/_include/imageViewer.html → ...ngo_large_image/_include/imageViewer.html
diff --git a/...mage/django_large_image/tests/__init__.py → django_large_image/tests/__init__.py b/...mage/django_large_image/tests/__init__.py → django_large_image/tests/__init__.py
diff --git a/...mage/django_large_image/tests/conftest.py → django_large_image/tests/conftest.py b/...mage/django_large_image/tests/conftest.py → django_large_image/tests/conftest.py
diff --git a/...age/django_large_image/tests/factories.py → django_large_image/tests/factories.py b/...age/django_large_image/tests/factories.py → django_large_image/tests/factories.py
diff --git a/...go-large-image/django_large_image/urls.py → django_large_image/urls.py b/...go-large-image/django_large_image/urls.py → django_large_image/urls.py
diff --git a/...rge-image/django_large_image/utilities.py → django_large_image/utilities.py b/...rge-image/django_large_image/utilities.py → django_large_image/utilities.py
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: .
       dockerfile: ./dev/django.Dockerfile
-    command: ["./manage.py", "runserver", "0.0.0.0:8000"]
+    command: ["./project/manage.py", "runserver", "0.0.0.0:8000"]
     # Log printing via Rich is enhanced by a TTY
     tty: false
     env_file: ./dev/.env.docker-compose

diff --git a/django-large-image/MANIFEST.in → project/MANIFEST.in b/django-large-image/MANIFEST.in → project/MANIFEST.in
@@ -1,3 +1,2 @@
 # Include any data files such as templates or static assets in the source distribution
-graft django_large_image/static
-graft django_large_image/templates
+graft example
diff --git a/Procfile → project/Procfile b/Procfile → project/Procfile
diff --git a/project/README.md b/project/README.md
@@ -0,0 +1,4 @@
+# Example Project
+
+This is an example Django project in the Girder4 fashion to demonstrate how
+`django-large-image` can be used.
diff --git a/example/__init__.py → project/example/__init__.py b/example/__init__.py → project/example/__init__.py
diff --git a/example/asgi.py → project/example/asgi.py b/example/asgi.py → project/example/asgi.py
diff --git a/example/core/__init__.py → project/example/core/__init__.py b/example/core/__init__.py → project/example/core/__init__.py
diff --git a/example/core/admin.py → project/example/core/admin.py b/example/core/admin.py → project/example/core/admin.py
diff --git a/example/core/apps.py → project/example/core/apps.py b/example/core/apps.py → project/example/core/apps.py
diff --git a/example/core/migrations/0001_default_site.py → ...mple/core/migrations/0001_default_site.py b/example/core/migrations/0001_default_site.py → ...mple/core/migrations/0001_default_site.py
diff --git a/example/core/migrations/0002_initial.py → ...t/example/core/migrations/0002_initial.py b/example/core/migrations/0002_initial.py → ...t/example/core/migrations/0002_initial.py
diff --git a/example/core/migrations/__init__.py → project/example/core/migrations/__init__.py b/example/core/migrations/__init__.py → project/example/core/migrations/__init__.py
diff --git a/example/core/models.py → project/example/core/models.py b/example/core/models.py → project/example/core/models.py
diff --git a/...core/templates/core/imagefile_detail.html → ...core/templates/core/imagefile_detail.html b/...core/templates/core/imagefile_detail.html → ...core/templates/core/imagefile_detail.html
diff --git a/...re/templates/core/s3imagefile_detail.html → ...re/templates/core/s3imagefile_detail.html b/...re/templates/core/s3imagefile_detail.html → ...re/templates/core/s3imagefile_detail.html
diff --git a/example/core/tests/__init__.py → project/example/core/tests/__init__.py b/example/core/tests/__init__.py → project/example/core/tests/__init__.py
diff --git a/example/core/tests/conftest.py → project/example/core/tests/conftest.py b/example/core/tests/conftest.py → project/example/core/tests/conftest.py
diff --git a/example/core/tests/factories.py → project/example/core/tests/factories.py b/example/core/tests/factories.py → project/example/core/tests/factories.py
diff --git a/example/core/urls.py → project/example/core/urls.py b/example/core/urls.py → project/example/core/urls.py
diff --git a/example/core/views.py → project/example/core/views.py b/example/core/views.py → project/example/core/views.py
diff --git a/example/core/viewsets.py → project/example/core/viewsets.py b/example/core/viewsets.py → project/example/core/viewsets.py
diff --git a/example/settings.py → project/example/settings.py b/example/settings.py → project/example/settings.py
diff --git a/example/urls.py → project/example/urls.py b/example/urls.py → project/example/urls.py
diff --git a/example/wsgi.py → project/example/wsgi.py b/example/wsgi.py → project/example/wsgi.py
diff --git a/manage.py → project/manage.py b/manage.py → project/manage.py
diff --git a/runtime.txt → project/runtime.txt b/runtime.txt → project/runtime.txt
diff --git a/django-large-image/setup.py → project/setup.py b/django-large-image/setup.py → project/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-readme_file = Path(__file__).parent.parent / 'README.md'
+readme_file = Path(__file__).parent / 'README.md'
 if readme_file.exists():
     with readme_file.open() as f:
         long_description = f.read()
@@ -11,7 +11,7 @@
     long_description = ''
 
 setup(
-    name='django-large-image',
+    name='example',
     version='0.1.0',
     description='',
     long_description=long_description,
@@ -37,16 +37,33 @@
     include_package_data=True,
     install_requires=[
         'django>=3.2',
+        'django-allauth',
+        'django-configurations[database,email]',
         'django-extensions',
-        'django-girder-utils',
+        'django-filter',
+        'django-oauth-toolkit<1.6.0',
         'djangorestframework',
         'drf-yasg',
-        'large-image>=1.9.0',
+        # Production-only
+        'django-composed-configuration[prod]>=0.18',
+        'django-s3-file-field[boto3]',
+        'gunicorn',
+        'django-large-image',
+        'large-image-source-gdal>=1.9.0',
+        'large-image-source-pil>=1.9.0',
     ],
     extras_require={
-        'colormaps': [
-            'matplotlib',
-            'cmocean',
+        'dev': [
+            'django-composed-configuration[dev]>=0.18',
+            'django-debug-toolbar',
+            'django-s3-file-field[minio]',
+            'ipython',
+            'tox',
+        ],
+        'graph': [
+            'pygraphviz',
+            'pyparsing',
+            'pydot',
         ],
     },
 )
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     long_description = ''
 
 setup(
-    name='example',
+    name='django-large-image',
     version='0.1.0',
     description='',
     long_description=long_description,
@@ -36,34 +36,17 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        'django>=3.2',
-        'django-allauth',
-        'django-configurations[database,email]',
+        'django~=3.2',
         'django-extensions',
-        'django-filter',
-        'django-oauth-toolkit<1.6.0',
+        'django-girder-utils',
         'djangorestframework',
         'drf-yasg',
-        # Production-only
-        'django-composed-configuration[prod]>=0.18',
-        'django-s3-file-field[boto3]',
-        'gunicorn',
-        'django-large-image',
-        'large-image-source-gdal>=1.9.0',
-        'large-image-source-pil>=1.9.0',
+        'large-image>=1.9.0',
     ],
     extras_require={
-        'dev': [
-            'django-composed-configuration[dev]>=0.18',
-            'django-debug-toolbar',
-            'django-s3-file-field[minio]',
-            'ipython',
-            'tox',
-        ],
-        'graph': [
-            'pygraphviz',
-            'pyparsing',
-            'pydot',
+        'colormaps': [
+            'matplotlib',
+            'cmocean',
         ],
     },
 )
diff --git a/tox.ini b/tox.ini
@@ -42,6 +42,7 @@ commands =
     black {posargs:.}
 
 [testenv:test]
+changedir = project
 passenv =
     DJANGO_CELERY_BROKER_URL
     DJANGO_DATABASE_URL
@@ -50,17 +51,20 @@ passenv =
     DJANGO_MINIO_STORAGE_SECRET_KEY
 extras =
     dev
+    colormaps
 deps =
     factory-boy
     pytest
     pytest-django
     pytest-factoryboy
     pytest-mock
-    -e ./django-large-image[colormaps,dev]
+    -e .[dev,colormaps]
+    -e ./project[dev]
 commands =
     pytest {posargs}
 
 [testenv:check-migrations]
+changedir = project
 setenv =
     DJANGO_CONFIGURATION = TestingConfiguration
     PIP_FIND_LINKS = https://girder.github.io/large_image_wheels
@@ -71,20 +75,22 @@ passenv =
     DJANGO_MINIO_STORAGE_ENDPOINT
     DJANGO_MINIO_STORAGE_SECRET_KEY
 deps =
-    -e ./django-large-image
+    -e .[dev]
+    -e ./project[dev]
 extras =
     dev
 commands =
-    {envpython} ./manage.py makemigrations --check --dry-run
+    {envpython} ./project/manage.py makemigrations --check --dry-run
 
 [testenv:graph-models]
+changedir = project
 setenv =
     PIP_FIND_LINKS = https://girder.github.io/large_image_wheels
 deps =
-      -e ./django-large-image
+    -e .[dev]
+    -e ./project[dev,graph]
 extras =
     dev
-    graph
 passenv =
     DJANGO_CONFIGURATION
     DJANGO_DATABASE_URL
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,3 +121,5 @@ dmypy.json
		.pyre/

		# End of https://www.gitignore.io/api/django

		.ipynb_checkpoints