Use source layout (#16)

* Use source layout * Apply suggestions from code review * Fix makefile
scientificcomputing · Sep 13, 2022 · bc2a4db · bc2a4db
1 parent 4cd4c5e
commit bc2a4db
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
@@ -17,8 +17,7 @@ jobs:
           python-version: "3.10"
 
       - name: Install dependencies
-        run: |
-          python -m pip install ".[docs]"
+        run: python -m pip install ".[docs]"
       - name: Build docs
         run: make doc
 

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ doc: # Generate Sphinx HTML documentation, including API docs
 # It has been added to _toc.yml as root
 	cp README.md docs/README.md 
 # We want to use the demos in the book, we convert them with jupytext and copy them to the documentation
-	jupytext --to=ipynb demos/demo.py --output=docs/demo.ipynb
+	jupytext --to=ipynb demo/demo.py --output=docs/demo.ipynb
 	jupyter book build docs
 
 clean-pytest: # Remove output from pytest

diff --git a/demos/demo.py → demo/demo.py b/demos/demo.py → demo/demo.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,11 @@
 requires = ["setuptools>=62.1.0", "wheel"]
 
 [tool.setuptools]
-py-modules = ["mypackage"]
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
 
 [project]
 name = "mypackage"

diff --git a/mypackage/__init__.py → src/mypackage/__init__.py b/mypackage/__init__.py → src/mypackage/__init__.py
diff --git a/mypackage/functions.py → src/mypackage/functions.py b/mypackage/functions.py → src/mypackage/functions.py