From 30ce7f8b1e1ca790ab56752602575aac6e33f8a5 Mon Sep 17 00:00:00 2001 From: Eleftherios Zisis Date: Thu, 8 Feb 2024 15:28:54 +0100 Subject: [PATCH 1/6] Add check-packaging --- MANIFEST.in | 9 +++------ pyproject.toml | 6 +++++- tox.ini | 11 ++++++++++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index c160149a..c873ba37 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,3 @@ -include requirements.txt -include requirements_dev.txt -include README.rst -recursive-exclude tests * -recursive-exclude tutorial * -graft neurom/config +include README.md +prune tests +prune tutorial diff --git a/pyproject.toml b/pyproject.toml index 69133aef..0dffd33d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,11 @@ Tracker = "https://github.com/BlueBrain/NeuroM/issues" neurom = 'neurom.apps.cli:cli' [tool.setuptools.packages.find] -include = ["neurom"] +where = ["neurom"] +namespaces = false + +[tool.setuptools.package-data] +"*" = ["morph_check.yaml", "morph_stats.yaml"] [tool.setuptools_scm] local_scheme = "no-local-version" diff --git a/tox.ini b/tox.ini index e4e40293..84b18b88 100644 --- a/tox.ini +++ b/tox.ini @@ -59,6 +59,15 @@ deps = commands = pytest --nbmake . +[testenv:check-packaging] +skip_install = true +deps = + build + twine +commands = + python -m build -o {envtmpdir}/dist + twine check {envtmpdir}/dist/* + [pycodestyle] max-line-length=100 @@ -70,5 +79,5 @@ python = 3.8: py38, lint 3.9: py39, docs 3.10: py310, tutorial - 3.11: py311 + 3.11: py311, check-packaging 3.12: py312 From 4194118b66f022a52863c6fe24f71b1de409c957 Mon Sep 17 00:00:00 2001 From: Eleftherios Zisis Date: Thu, 8 Feb 2024 15:32:49 +0100 Subject: [PATCH 2/6] Fix --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0dffd33d..4c409787 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ Tracker = "https://github.com/BlueBrain/NeuroM/issues" neurom = 'neurom.apps.cli:cli' [tool.setuptools.packages.find] -where = ["neurom"] +where = ["."] namespaces = false [tool.setuptools.package-data] From c33741e4792ddb9503a65b703e6316611edd6156 Mon Sep 17 00:00:00 2001 From: Eleftherios Zisis Date: Thu, 8 Feb 2024 15:38:32 +0100 Subject: [PATCH 3/6] Add --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 84b18b88..829d8e1e 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ envlist = docs coverage tutorial + check-packaging py{38,39,310,311,312} [testenv] From a2e3faed085cc3e2be9e058fa8e429d92285ecc8 Mon Sep 17 00:00:00 2001 From: Eleftherios Zisis Date: Fri, 9 Feb 2024 11:09:09 +0100 Subject: [PATCH 4/6] Revert --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4c409787..e997c78d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ Tracker = "https://github.com/BlueBrain/NeuroM/issues" neurom = 'neurom.apps.cli:cli' [tool.setuptools.packages.find] -where = ["."] +include = ["neurom"] namespaces = false [tool.setuptools.package-data] From 4a75b7af0301f883acd7100c4a83929c4eb9dd4a Mon Sep 17 00:00:00 2001 From: Eleftherios Zisis Date: Fri, 9 Feb 2024 11:20:53 +0100 Subject: [PATCH 5/6] where neurom --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e997c78d..0dffd33d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ Tracker = "https://github.com/BlueBrain/NeuroM/issues" neurom = 'neurom.apps.cli:cli' [tool.setuptools.packages.find] -include = ["neurom"] +where = ["neurom"] namespaces = false [tool.setuptools.package-data] From e9af1424176585831875f81b203928aa72a91e9e Mon Sep 17 00:00:00 2001 From: Eleftherios Zisis Date: Fri, 9 Feb 2024 11:35:04 +0100 Subject: [PATCH 6/6] Back to include --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0dffd33d..e997c78d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ Tracker = "https://github.com/BlueBrain/NeuroM/issues" neurom = 'neurom.apps.cli:cli' [tool.setuptools.packages.find] -where = ["neurom"] +include = ["neurom"] namespaces = false [tool.setuptools.package-data]