build: adapt /src layout

From: https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/ The src layout involves an additional step in the development workflow of a project (typically, an editable installation is used for development and a regular installation is used for testing). (...) The src layout helps enforce that an editable installation is only able to import files that were meant to be importable. (...) This is especially relevant when the editable installation is implemented using a path configuration file that adds the directory to the import path.
openfisca · Oct 22, 2024 · 0f27393 · 0f27393
1 parent cddbb82
commit 0f27393
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-graft openfisca_extension_template
+graft src
 global-exclude *~ *.py[cod] *.so
diff --git a/Makefile b/Makefile
@@ -33,4 +33,4 @@ lint: clean
 	poetry run shellcheck `git ls-files | grep "\.sh$$"`
 
 test: clean
-	poetry run openfisca test --country-package=openfisca_country_template --extensions=openfisca_extension_template openfisca_extension_template/tests
+	poetry run openfisca test --country-package=openfisca_country_template --extensions=openfisca_extension_template tests
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Topic :: Scientific/Engineering :: Information Analysis",
 ]
-packages = [ { include = "openfisca_extension_template", from = "." } ]
+packages = [ { include = "openfisca_extension_template", from = "src" } ]
 
 [tool.poetry.dependencies]
 python = "~3.9 || ~3.10 || ~3.11"
@@ -116,9 +116,9 @@ commands = [
     [
         "openfisca",
         "test",
+        "tests",
         "--country-package=openfisca_country_template",
         "--extensions=openfisca_extension_template",
-        "openfisca_extension_template/tests",
     ]
 ]
 commands_pre = [

diff --git a/openfisca_extension_template/__init__.py → src/openfisca_extension_template/__init__.py b/openfisca_extension_template/__init__.py → src/openfisca_extension_template/__init__.py
diff --git a/...rs/local_town/child_allowance/amount.yaml → ...rs/local_town/child_allowance/amount.yaml b/...rs/local_town/child_allowance/amount.yaml → ...rs/local_town/child_allowance/amount.yaml
diff --git a/...ers/local_town/child_allowance/index.yaml → ...ers/local_town/child_allowance/index.yaml b/...ers/local_town/child_allowance/index.yaml → ...ers/local_town/child_allowance/index.yaml
diff --git a/...template/parameters/local_town/index.yaml → ...template/parameters/local_town/index.yaml b/...template/parameters/local_town/index.yaml → ...template/parameters/local_town/index.yaml
diff --git a/...isca_extension_template/tests/__init__.py → ..._extension_template/variables/__init__.py b/...isca_extension_template/tests/__init__.py → ..._extension_template/variables/__init__.py
diff --git a/...nsion_template/variables/local_benefit.py → ...nsion_template/variables/local_benefit.py b/...nsion_template/variables/local_benefit.py → ...nsion_template/variables/local_benefit.py
diff --git a/..._extension_template/variables/__init__.py → .../openfisca_extension_template/__init__.py b/..._extension_template/variables/__init__.py → .../openfisca_extension_template/__init__.py
diff --git a/...tension_template/tests/local_benefit.yaml → ...sca_extension_template/local_benefit.yaml b/...tension_template/tests/local_benefit.yaml → ...sca_extension_template/local_benefit.yaml
diff --git a/...isca_extension_template/tests/test_api.py → .../openfisca_extension_template/test_api.py b/...isca_extension_template/tests/test_api.py → .../openfisca_extension_template/test_api.py