maint: migrate to src layout

JSS95 · Sep 22, 2023 · 41cd9dd · 41cd9dd
1 parent 6f21fb7
commit 41cd9dd
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 17 deletions.
diff --git a/setup.cfg → .flake8 b/setup.cfg → .flake8
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: |
@@ -37,17 +37,20 @@ 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: |
-          pip install mypy .[test]
+          pip install mypy
 
       - name: run mypy check
-        run: mypy dawiq
+        run: |
+          mypy src
 
   unit-test:
 
@@ -61,7 +64,6 @@ jobs:
 
     strategy:
       fail-fast: false
-
       matrix:
         os : [ubuntu-latest, windows-latest, macos-latest]
         python: ["3.9", "3.10", "3.11"]
@@ -75,10 +77,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
         with:
           python-version: ${{ matrix.python }}
 
@@ -91,7 +93,8 @@ jobs:
 
       - name: install package
         run: |
-          pip install .[test-headless]
+          pip install pytest-xvfb
+          pip install .[test]
 
       - run: pytest
 
@@ -104,10 +107,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/dawiq/tests/__init__.py b/dawiq/tests/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
 requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "dawiq"
@@ -41,10 +42,6 @@ test = [
     "pytest",
     "pytest-qt",
 ]
-test-headless = [
-    "dawiq[test]",
-    "pytest-xvfb",
-]
 doc = [
     "numpydoc",
     "sphinx",
@@ -55,3 +52,6 @@ full = ["dawiq[test,doc]"]
 
 [tool.setuptools.dynamic]
 version = {attr = "dawiq.version.__version__"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
diff --git a/pytest.ini b/pytest.ini
@@ -1,7 +1,8 @@
 [pytest]
 
 testpaths =
-    dawiq
+    src
+    tests
     doc/source
 
 doctest_optionflags =

diff --git a/dawiq/__init__.py → src/dawiq/__init__.py b/dawiq/__init__.py → src/dawiq/__init__.py
diff --git a/dawiq/datawidget.py → src/dawiq/datawidget.py b/dawiq/datawidget.py → src/dawiq/datawidget.py
diff --git a/dawiq/delegate.py → src/dawiq/delegate.py b/dawiq/delegate.py → src/dawiq/delegate.py
diff --git a/dawiq/fieldwidgets.py → src/dawiq/fieldwidgets.py b/dawiq/fieldwidgets.py → src/dawiq/fieldwidgets.py
diff --git a/dawiq/multitype.py → src/dawiq/multitype.py b/dawiq/multitype.py → src/dawiq/multitype.py
diff --git a/dawiq/py.typed → src/dawiq/py.typed b/dawiq/py.typed → src/dawiq/py.typed
diff --git a/dawiq/qt_compat.py → src/dawiq/qt_compat.py b/dawiq/qt_compat.py → src/dawiq/qt_compat.py
diff --git a/dawiq/typing.py → src/dawiq/typing.py b/dawiq/typing.py → src/dawiq/typing.py
diff --git a/dawiq/version.py → src/dawiq/version.py b/dawiq/version.py → src/dawiq/version.py
diff --git a/dawiq/tests/test_datawidget.py → tests/test_datawidget.py b/dawiq/tests/test_datawidget.py → tests/test_datawidget.py
diff --git a/dawiq/tests/test_delegate.py → tests/test_delegate.py b/dawiq/tests/test_delegate.py → tests/test_delegate.py
diff --git a/dawiq/tests/test_fieldwidgets.py → tests/test_fieldwidgets.py b/dawiq/tests/test_fieldwidgets.py → tests/test_fieldwidgets.py
diff --git a/dawiq/tests/test_multitype.py → tests/test_multitype.py b/dawiq/tests/test_multitype.py → tests/test_multitype.py
diff --git a/dawiq/tests/test_qt_compat.py → tests/test_qt_compat.py b/dawiq/tests/test_qt_compat.py → tests/test_qt_compat.py