Merge pull request #49 from opengisch/pyproject

opengisch · Nov 19, 2023 · 1f34247 · 1f34247
2 parents 23aaf84 + 53948c6
commit 1f34247
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 9 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -32,3 +32,21 @@ jobs:
       - name: Test on QGIS LTR 3.
         run: |
           docker-compose -f .docker/docker-compose.yml run qgis /usr/src/.docker/run-docker-tests.sh
+  test_packaging:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+          with:
+            submodules: recursive
+        - name: Setup Python
+          uses: actions/setup-python@v4
+          with:
+            python-version: 3.8
+            cache: 'pip'
+        - name: Install toolchain
+          run: pip install build
+        - name: Package with build
+          run:  python -m build
+        - name: Install with pip
+          run: pip install .
diff --git a/__init__.py → libqfieldsync/__init__.py b/__init__.py → libqfieldsync/__init__.py
diff --git a/layer.py → libqfieldsync/layer.py b/layer.py → libqfieldsync/layer.py
diff --git a/offline_converter.py → libqfieldsync/offline_converter.py b/offline_converter.py → libqfieldsync/offline_converter.py
diff --git a/project.py → libqfieldsync/project.py b/project.py → libqfieldsync/project.py
diff --git a/project_checker.py → libqfieldsync/project_checker.py b/project_checker.py → libqfieldsync/project_checker.py
@@ -4,16 +4,13 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional
 
-from qfieldsync.libqfieldsync.layer import (
-    LayerSource,
-    SyncAction,
-    UnsupportedPrimaryKeyError,
-)
-from qfieldsync.libqfieldsync.project import ProjectConfiguration, ProjectProperties
-from qfieldsync.libqfieldsync.utils.file_utils import isascii
 from qgis.core import Qgis, QgsMapLayer, QgsProject, QgsSettings
 from qgis.PyQt.QtCore import QObject
 
+from libqfieldsync.layer import LayerSource, SyncAction, UnsupportedPrimaryKeyError
+from libqfieldsync.project import ProjectConfiguration, ProjectProperties
+from libqfieldsync.utils.file_utils import isascii
+
 from .offline_converter import ExportType
 
 if sys.version_info >= (3, 8):

diff --git a/utils/__init__.py → libqfieldsync/utils/__init__.py b/utils/__init__.py → libqfieldsync/utils/__init__.py
diff --git a/utils/bad_layer_handler.py → libqfieldsync/utils/bad_layer_handler.py b/utils/bad_layer_handler.py → libqfieldsync/utils/bad_layer_handler.py
diff --git a/utils/exceptions.py → libqfieldsync/utils/exceptions.py b/utils/exceptions.py → libqfieldsync/utils/exceptions.py
diff --git a/utils/file_utils.py → libqfieldsync/utils/file_utils.py b/utils/file_utils.py → libqfieldsync/utils/file_utils.py
diff --git a/utils/logger.py → libqfieldsync/utils/logger.py b/utils/logger.py → libqfieldsync/utils/logger.py
diff --git a/utils/qgis.py → libqfieldsync/utils/qgis.py b/utils/qgis.py → libqfieldsync/utils/qgis.py
diff --git a/utils/xml.py → libqfieldsync/utils/xml.py b/utils/xml.py → libqfieldsync/utils/xml.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,30 @@
+[build-system]
+requires = [
+    "setuptools>=68.0",
+    "wheel",
+]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = ["libqfieldsync", "libqfieldsync.utils"]
+
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements.txt"] }
+
+[project]
+name = "libqfieldsync"
+description = "the qfieldsync library"
+version = "1.0"
+authors = [
+    { name = "OPENGIS.ch", email = "[email protected]" }
+]
+requires-python = ">=3.8"
+
+[project.urls]
+homepage = "https://github.com/opengisch/libqfieldsync"
+documentation = "https://docs.qfield.org/get-started/"
+repository = "https://github.com/opengisch/libqfieldsync"
+tracker = "https://github.com/opengisch/libqfieldsync/issues"
+
+[project.optional-dependencies]
+dev = ["pre-commit"]
diff --git a/tests/test_offline_converter.py b/tests/test_offline_converter.py
@@ -21,13 +21,14 @@
 
 import shutil
 import tempfile
+import unittest
 from pathlib import Path
 
 from qgis.core import QgsOfflineEditing, QgsProject
-from qgis.testing import start_app, unittest
+from qgis.testing import start_app
 from qgis.testing.mocked import get_iface
 
-from ..offline_converter import ExportType, OfflineConverter
+from libqfieldsync.offline_converter import ExportType, OfflineConverter
 
 start_app()