Move files to src layout

Using src layout to organize modules (https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/) This change make it directly detect the package_data import issue of "qeapp.yml" (manifest #255) and css/jinja files in static module. bumpver
aiidalab · Aug 17, 2023 · d740fbf · d740fbf
1 parent 823a6fb
commit d740fbf
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 2 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -20,6 +20,8 @@ project_urls =
     Logo = https://raw.githubusercontent.com/aiidalab/aiidalab-qe/master/miscellaneous/logos/QE.jpg
 
 [options]
+package_dir =
+    = src
 packages = find:
 install_requires =
     aiida-core~=2.2,<3
@@ -32,6 +34,9 @@ install_requires =
     pydantic~=1.10,>=1.10.8
 python_requires = >=3.8
 
+[options.packages.find]
+where = src
+
 [options.extras_require]
 dev =
     bumpver~=2023.1124
@@ -46,7 +51,8 @@ dev =
     selenium~=4.7.0
 
 [options.package_data]
-aiidalab_qe.parameters = qeapp.yaml
+aiidalab_qe.app.parameters = qeapp.yaml
+aiidalab_qe.app.static = *
 
 [aiidalab]
 title = Quantum ESPRESSO
@@ -69,7 +75,7 @@ tag = True
 push = True
 
 [bumpver:file_patterns]
-aiidalab_qe/version.py =
+src/aiidalab_qe/version.py =
     __version__ = "{version}"
 setup.cfg =
     current_version = "{version}"

diff --git a/aiidalab_qe/__init__.py → src/aiidalab_qe/__init__.py b/aiidalab_qe/__init__.py → src/aiidalab_qe/__init__.py
diff --git a/aiidalab_qe/__main__.py → src/aiidalab_qe/__main__.py b/aiidalab_qe/__main__.py → src/aiidalab_qe/__main__.py
diff --git a/aiidalab_qe/app/__init__.py → src/aiidalab_qe/app/__init__.py b/aiidalab_qe/app/__init__.py → src/aiidalab_qe/app/__init__.py
diff --git a/aiidalab_qe/app/node_view.py → src/aiidalab_qe/app/node_view.py b/aiidalab_qe/app/node_view.py → src/aiidalab_qe/app/node_view.py
diff --git a/aiidalab_qe/app/parameters/__init__.py → src/aiidalab_qe/app/parameters/__init__.py b/aiidalab_qe/app/parameters/__init__.py → src/aiidalab_qe/app/parameters/__init__.py
diff --git a/aiidalab_qe/app/parameters/qeapp.yaml → src/aiidalab_qe/app/parameters/qeapp.yaml b/aiidalab_qe/app/parameters/qeapp.yaml → src/aiidalab_qe/app/parameters/qeapp.yaml
diff --git a/aiidalab_qe/app/process.py → src/aiidalab_qe/app/process.py b/aiidalab_qe/app/process.py → src/aiidalab_qe/app/process.py
diff --git a/aiidalab_qe/app/pseudos.py → src/aiidalab_qe/app/pseudos.py b/aiidalab_qe/app/pseudos.py → src/aiidalab_qe/app/pseudos.py
diff --git a/aiidalab_qe/app/report.py → src/aiidalab_qe/app/report.py b/aiidalab_qe/app/report.py → src/aiidalab_qe/app/report.py
diff --git a/aiidalab_qe/app/setup_codes.py → src/aiidalab_qe/app/setup_codes.py b/aiidalab_qe/app/setup_codes.py → src/aiidalab_qe/app/setup_codes.py
diff --git a/aiidalab_qe/app/sssp.py → src/aiidalab_qe/app/sssp.py b/aiidalab_qe/app/sssp.py → src/aiidalab_qe/app/sssp.py
diff --git a/aiidalab_qe/app/static/__init__.py → src/aiidalab_qe/app/static/__init__.py b/aiidalab_qe/app/static/__init__.py → src/aiidalab_qe/app/static/__init__.py
diff --git a/aiidalab_qe/app/static/style.css → src/aiidalab_qe/app/static/style.css b/aiidalab_qe/app/static/style.css → src/aiidalab_qe/app/static/style.css
diff --git a/aiidalab_qe/app/static/welcome.jinja → src/aiidalab_qe/app/static/welcome.jinja b/aiidalab_qe/app/static/welcome.jinja → src/aiidalab_qe/app/static/welcome.jinja
diff --git a/...alab_qe/app/static/workflow_failure.jinja → ...alab_qe/app/static/workflow_failure.jinja b/...alab_qe/app/static/workflow_failure.jinja → ...alab_qe/app/static/workflow_failure.jinja
diff --git a/...alab_qe/app/static/workflow_summary.jinja → ...alab_qe/app/static/workflow_summary.jinja b/...alab_qe/app/static/workflow_summary.jinja → ...alab_qe/app/static/workflow_summary.jinja
diff --git a/aiidalab_qe/app/steps.py → src/aiidalab_qe/app/steps.py b/aiidalab_qe/app/steps.py → src/aiidalab_qe/app/steps.py
diff --git a/aiidalab_qe/app/structures.py → src/aiidalab_qe/app/structures.py b/aiidalab_qe/app/structures.py → src/aiidalab_qe/app/structures.py
diff --git a/aiidalab_qe/app/widgets.py → src/aiidalab_qe/app/widgets.py b/aiidalab_qe/app/widgets.py → src/aiidalab_qe/app/widgets.py
diff --git a/aiidalab_qe/version.py → src/aiidalab_qe/version.py b/aiidalab_qe/version.py → src/aiidalab_qe/version.py
diff --git a/aiidalab_qe/workflows/__init__.py → src/aiidalab_qe/workflows/__init__.py b/aiidalab_qe/workflows/__init__.py → src/aiidalab_qe/workflows/__init__.py