Merge pull request #46 from JSS95/src-layout

maint: migrate to src-layout
JSS95 · Sep 22, 2023 · dfb8c47 · dfb8c47
2 parents 7123013 + 90b251b
commit dfb8c47
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 35 deletions.
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,8 @@
+[flake8]
+doctests = True
+exclude = 
+    doc/build,
+# compatibility with black
+max-line-length = 88
+extend-ignore =
+    E203,
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,10 +11,10 @@ jobs:
     steps: 
 
       - name: get repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
 
       - name: install dependencies
         run: |
@@ -34,33 +34,23 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-
-      matrix:
-        qt: [PySide6, PyQt6]
-
     steps: 
 
       - name: get repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: set up Python
-        uses: actions/setup-python@v2
-
-      - name: install qt
-        run: |
-          pip install ${{ matrix.qt }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
 
       - name: install package
         run: |
-          pip install mypy .[test]
+          pip install mypy
 
       - name: run mypy check
         run: |
-          mypy civiq6
-          mypy doc/source --exclude doc/source/examples
-          mypy doc/source/examples/${{ matrix.qt }}
+          mypy src
 
   doc:
 
@@ -71,10 +61,12 @@ jobs:
     steps: 
 
       - name: get repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
 
       - name: install package
         run: |

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
 requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "civiq6"
@@ -24,6 +25,7 @@ classifiers = [
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Multimedia :: Graphics",
         "Topic :: Software Development",
         "Topic :: Software Development :: Libraries :: Python Modules",
@@ -53,3 +55,6 @@ full = ["civiq6[test,doc]"]
 
 [tool.setuptools.dynamic]
 version = {attr = "civiq6.version.__version__"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
diff --git a/setup.cfg b/setup.cfg
diff --git a/civiq6/__init__.py → src/civiq6/__init__.py b/civiq6/__init__.py → src/civiq6/__init__.py
diff --git a/civiq6/camera.py → src/civiq6/camera.py b/civiq6/camera.py → src/civiq6/camera.py
diff --git a/civiq6/capture.py → src/civiq6/capture.py b/civiq6/capture.py → src/civiq6/capture.py
diff --git a/civiq6/devices.py → src/civiq6/devices.py b/civiq6/devices.py → src/civiq6/devices.py
diff --git a/civiq6/py.typed → src/civiq6/py.typed b/civiq6/py.typed → src/civiq6/py.typed
diff --git a/civiq6/qt_compat.py → src/civiq6/qt_compat.py b/civiq6/qt_compat.py → src/civiq6/qt_compat.py
diff --git a/civiq6/version.py → src/civiq6/version.py b/civiq6/version.py → src/civiq6/version.py