replace setup.py with pyproject.toml

wq · Jun 13, 2023 · 9499bb6 · 9499bb6
1 parent 4eecf38
commit 9499bb6
Show file tree

Hide file tree

Showing 26 changed files with 65 additions and 115 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,27 +12,27 @@ jobs:
       matrix:
         variant: [default, spatialite, postgis]
         python-version: ["3.11"]
-        django-version: [3.2.16, 4.1.3]
+        django-version: [3.2.19, 4.2.2]
         drf-version: [3.14.0]
         include:
         - python-version: "3.11"
           django-version: 3.2.16
           drf-version: 3.12.4
           variant: default
         - python-version: "3.11"
-          django-version: 4.1.3
+          django-version: 4.2.2
           drf-version: 3.14.0
           variant: nonroot
         - python-version: 3.9
-          django-version: 4.1.3
+          django-version: 4.2.2
           drf-version: 3.14.0
           variant: default
         - python-version: 3.8
-          django-version: 4.1.3
+          django-version: 4.2.2
           drf-version: 3.14.0
           variant: default
         - python-version: 3.7
-          django-version: 3.2.16
+          django-version: 3.2.19
           drf-version: 3.14.0
           variant: default
     steps:
@@ -44,11 +44,12 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        python -m pip install build
         python -m pip install flake8 pytest wheel
         python -m pip install django==${{ matrix.django-version }}
         python -m pip install djangorestframework==${{ matrix.drf-version }}
+        python -m pip install html-json-forms drf-writable-nested pystache
         python -m pip install git+https://github.com/wq/django-natural-keys.git
-        python -m pip install .
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
@@ -74,4 +75,6 @@ jobs:
         psql wqdb_test -c "CREATE EXTENSION postgis;"
         python -m pip install "psycopg2-binary"
     - name: Test with unittest
-      run: python setup.py test
+      run: python -m unittest discover -s tests -t . -v
+    - name: Test build
+      run: python -m build
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,5 @@
 *.sw?
 build
 dist
-wq/
 tests/media
 wqdb_test.sqlite3
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,55 @@
+[build-system]
+requires = ["setuptools", "setuptools-scm"]
+
+[project]
+name = "wq.db"
+dynamic = ["version"]
+authors = [
+    {name = "S. Andrew Sheppard", email = "andrew@wq.io"},
+]
+description = "Django REST API for offline mobile surveys and field data collection."
+readme = "README.md"
+requires-python = ">=3.7"
+license = {text = "MIT"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "License :: OSI Approved :: MIT License",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Framework :: Django",
+    "Framework :: Django :: 3.2",
+    "Framework :: Django :: 4.0",
+    "Framework :: Django :: 4.1",
+    "Framework :: Django :: 4.2",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+    "Topic :: Text Processing :: Markup :: HTML",
+    "Topic :: Scientific/Engineering :: GIS",
+    "Topic :: Database :: Database Engines/Servers",
+]
+dependencies = [
+    "Django>=1.11,<5.0",
+    "djangorestframework>=3.8.0,<4.0",
+    "html-json-forms",
+    "natural-keys>=1.6.0",
+    "drf-writable-nested",
+    "pystache",
+]
+
+[project.entry-points.wq]
+"wq.db" = "wq.db"
+
+[project.urls]
+Homepage = "https://wq.io/wq.db/"
+Documentation = "https://wq.io/"
+Source = "https://github.com/wq/wq.db"
+"Release Notes" = "https://github.com/wq/wq.db/releases"
+Issues = "https://github.com/wq/wq.db/issues"
+CI = "https://github.com/wq/wq.db/actions/workflows/test.yml"
+
+[tool.setuptools_scm]
diff --git a/runserver.sh b/runserver.sh
diff --git a/setup.py b/setup.py
diff --git a/__init__.py → wq/db/__init__.py b/__init__.py → wq/db/__init__.py
diff --git a/rest/__init__.py → wq/db/rest/__init__.py b/rest/__init__.py → wq/db/rest/__init__.py
diff --git a/rest/apps.py → wq/db/rest/apps.py b/rest/apps.py → wq/db/rest/apps.py
diff --git a/rest/auth/__init__.py → wq/db/rest/auth/__init__.py b/rest/auth/__init__.py → wq/db/rest/auth/__init__.py
diff --git a/rest/auth/apps.py → wq/db/rest/auth/apps.py b/rest/auth/apps.py → wq/db/rest/auth/apps.py
diff --git a/rest/auth/rest.py → wq/db/rest/auth/rest.py b/rest/auth/rest.py → wq/db/rest/auth/rest.py
diff --git a/rest/auth/serializers.py → wq/db/rest/auth/serializers.py b/rest/auth/serializers.py → wq/db/rest/auth/serializers.py
diff --git a/rest/auth/views.py → wq/db/rest/auth/views.py b/rest/auth/views.py → wq/db/rest/auth/views.py
diff --git a/rest/exceptions.py → wq/db/rest/exceptions.py b/rest/exceptions.py → wq/db/rest/exceptions.py
diff --git a/rest/filters.py → wq/db/rest/filters.py b/rest/filters.py → wq/db/rest/filters.py
diff --git a/rest/management/__init__.py → wq/db/rest/management/__init__.py b/rest/management/__init__.py → wq/db/rest/management/__init__.py
diff --git a/rest/management/commands/__init__.py → wq/db/rest/management/commands/__init__.py b/rest/management/commands/__init__.py → wq/db/rest/management/commands/__init__.py
diff --git a/rest/management/commands/dump_config.py → ...b/rest/management/commands/dump_config.py b/rest/management/commands/dump_config.py → ...b/rest/management/commands/dump_config.py
diff --git a/rest/models.py → wq/db/rest/models.py b/rest/models.py → wq/db/rest/models.py
diff --git a/rest/negotiation.py → wq/db/rest/negotiation.py b/rest/negotiation.py → wq/db/rest/negotiation.py
diff --git a/rest/pagination.py → wq/db/rest/pagination.py b/rest/pagination.py → wq/db/rest/pagination.py
diff --git a/rest/permissions.py → wq/db/rest/permissions.py b/rest/permissions.py → wq/db/rest/permissions.py
diff --git a/rest/renderers.py → wq/db/rest/renderers.py b/rest/renderers.py → wq/db/rest/renderers.py
diff --git a/rest/routers.py → wq/db/rest/routers.py b/rest/routers.py → wq/db/rest/routers.py
diff --git a/rest/serializers.py → wq/db/rest/serializers.py b/rest/serializers.py → wq/db/rest/serializers.py
diff --git a/rest/views.py → wq/db/rest/views.py b/rest/views.py → wq/db/rest/views.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,5 @@ @@
     *.sw?
     build
     dist
-    wq/
     tests/media
     wqdb_test.sqlite3