moved package to src/

janscience · Apr 19, 2024 · c587854 · c587854
1 parent 2c18366
commit c587854
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/runchecks.yml b/.github/workflows/runchecks.yml
@@ -35,7 +35,7 @@ jobs:
         shell: bash
 
       - name: Run tests
-        run: python3 -m pytest -v --cov-report xml --cov-report html:cover --cov-report term --cov audioio tests/
+        run: pytest -v --cov-report xml --cov-report html:cover --cov-report term --cov audioio tests/
         shell: bash
 
       - name: Build documentation

diff --git a/.github/workflows/uploaddocs.yml b/.github/workflows/uploaddocs.yml
@@ -32,7 +32,7 @@ jobs:
           pip install -r requirements.txt
 
       - name: Run tests
-        run: python3 -m pytest -v --cov-report xml --cov-report html:cover --cov-report term --cov audioio tests/
+        run: pytest -v --cov-report xml --cov-report html:cover --cov-report term --cov audioio tests/
         shell: bash
 
       - name: Build documentation

diff --git a/build-docs.sh b/build-docs.sh
@@ -9,6 +9,7 @@ for cmd in mkdocs pdoc3; do
 done
 
 PACKAGE="audioio"
+PACKAGESRC="src/$PACKAGE"
 PACKAGEROOT="$(dirname "$(realpath "$0")")"
 BUILDROOT="$PACKAGEROOT/site"
 
@@ -58,7 +59,7 @@ if command -v pdoc3 >/dev/null; then
     echo
 
     cd "$PACKAGEROOT"
-    pdoc3 --html --config latex_math=True --config sort_identifiers=False --output-dir "$BUILDROOT/api-tmp" $PACKAGE
+    pdoc3 --html --config latex_math=True --config sort_identifiers=False --output-dir "$BUILDROOT/api-tmp" $PACKAGESRC
     mv "$BUILDROOT/api-tmp/$PACKAGE" "$BUILDROOT/api"
     rmdir "$BUILDROOT/api-tmp"
     cd - > /dev/null

diff --git a/pyproject.toml b/pyproject.toml
@@ -47,3 +47,6 @@ audiomodules   = "audioio.audiomodules:main"
 
 [tool.setuptools.dynamic]
 version = {attr = "audioio.version.__version__"}
+
+[tool.pytest.ini_options]
+pythonpath = "src"
diff --git a/setup.py b/setup.py
@@ -1,5 +1,3 @@
 from setuptools import setup
 
-setup(
-    packages = ['audioio']
-)
+setup()
diff --git a/audioio/__init__.py → src/audioio/__init__.py b/audioio/__init__.py → src/audioio/__init__.py
diff --git a/audioio/audioconverter.py → src/audioio/audioconverter.py b/audioio/audioconverter.py → src/audioio/audioconverter.py
diff --git a/audioio/audioloader.py → src/audioio/audioloader.py b/audioio/audioloader.py → src/audioio/audioloader.py
diff --git a/audioio/audiomarkers.py → src/audioio/audiomarkers.py b/audioio/audiomarkers.py → src/audioio/audiomarkers.py
diff --git a/audioio/audiometadata.py → src/audioio/audiometadata.py b/audioio/audiometadata.py → src/audioio/audiometadata.py
diff --git a/audioio/audiomodules.py → src/audioio/audiomodules.py b/audioio/audiomodules.py → src/audioio/audiomodules.py
diff --git a/audioio/audiotools.py → src/audioio/audiotools.py b/audioio/audiotools.py → src/audioio/audiotools.py
diff --git a/audioio/audiowriter.py → src/audioio/audiowriter.py b/audioio/audiowriter.py → src/audioio/audiowriter.py
diff --git a/audioio/playaudio.py → src/audioio/playaudio.py b/audioio/playaudio.py → src/audioio/playaudio.py
diff --git a/audioio/riffmetadata.py → src/audioio/riffmetadata.py b/audioio/riffmetadata.py → src/audioio/riffmetadata.py
diff --git a/audioio/version.py → src/audioio/version.py b/audioio/version.py → src/audioio/version.py