Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add check-packaging #1108

Merged
merged 6 commits into from
Mar 27, 2024
Merged

Add check-packaging #1108

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30ce7f8
Add check-packaging
eleftherioszisis Feb 8, 2024
4194118
Fix
eleftherioszisis Feb 8, 2024
c33741e
Add
eleftherioszisis Feb 8, 2024
a2e3fae
Revert
eleftherioszisis Feb 9, 2024
4a75b7a
where neurom
eleftherioszisis Feb 9, 2024
e9af142
Back to include
eleftherioszisis Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ Tracker = "https://github.com/BlueBrain/NeuroM/issues"
neurom = 'neurom.apps.cli:cli'

[tool.setuptools.packages.find]
include = ["neurom"]
where = ["."]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you check the sdist to see everything worked?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be where = ["neurom*"] to avoid including tests and other random stuffs.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to that. Both include and where seem to work. With the latest changes I get:
wheel:

.
├── apps
│   ├── annotate.py
│   ├── cli.py
│   ├── config
│   │   ├── morph_check.yaml
│   │   └── morph_stats.yaml
│   ├── __init__.py
│   ├── morph_check.py
│   └── morph_stats.py
├── check
│   ├── __init__.py
│   ├── morphology_checks.py
│   ├── morphtree.py
│   ├── neuron_checks.py
│   └── runner.py
├── core
│   ├── dataformat.py
│   ├── __init__.py
│   ├── morphology.py
│   ├── neuron.py
│   ├── population.py
│   ├── soma.py
│   └── types.py
├── features
│   ├── bifurcationfunc.py
│   ├── bifurcation.py
│   ├── __init__.py
│   ├── morphology.py
│   ├── neurite.py
│   ├── population.py
│   ├── sectionfunc.py
│   └── section.py
├── geom
│   ├── __init__.py
│   └── transform.py
├── io
│   ├── __init__.py
│   └── utils.py
├── neurom-3.2.9.dev5.dist-info
│   ├── AUTHORS.md
│   ├── entry_points.txt
│   ├── LICENSE.txt
│   ├── METADATA
│   ├── RECORD
│   ├── top_level.txt
│   └── WHEEL
└── view
    ├── dendrogram.py
    ├── __init__.py
    ├── matplotlib_impl.py
    ├── matplotlib_utils.py
    └── plotly_impl.py

source tar:

.
├── asv.conf.json
├── AUTHORS.md
├── CHANGELOG.rst
├── doc
│   ├── clean.sh
│   ├── make.bat
│   ├── Makefile
│   └── source
│       ├── api.rst
│       ├── changelog.rst
│       ├── cli.rst
│       ├── conf.py
│       ├── definitions.rst
│       ├── developer.rst
│       ├── documentation.rst
│       ├── examples.rst
│       ├── features.rst
│       ├── images
│       │   ├── spherical_coordinates.svg
│       │   └── spherical_coordinates.tex
│       ├── index.rst
│       ├── install.rst
│       ├── license.rst
│       ├── logo
│       │   └── NeuroM.jpg
│       ├── migration.rst
│       ├── morph_check.rst
│       ├── morph_stats.rst
│       ├── quickstart.rst
│       ├── spherical_coordinates.rst
│       ├── tutorial.rst
│       └── validation.rst
├── examples
│   ├── boxplot.py
│   ├── density_plot.py
│   ├── end_to_end_distance.py
│   ├── extract_distribution.py
│   ├── features_graph_table.py
│   ├── get_features.py
│   ├── histogram.py
│   ├── iteration_analysis.py
│   ├── nl_fst_compat.py
│   ├── plot_somas.py
│   ├── radius_of_gyration.py
│   ├── section_ids.py
│   └── soma_radius_fit.py
├── LICENSE.txt
├── MANIFEST.in
├── neurom
│   ├── apps
│   │   ├── annotate.py
│   │   ├── cli.py
│   │   ├── config
│   │   │   ├── morph_check.yaml
│   │   │   └── morph_stats.yaml
│   │   ├── __init__.py
│   │   ├── morph_check.py
│   │   └── morph_stats.py
│   ├── check
│   │   ├── __init__.py
│   │   ├── morphology_checks.py
│   │   ├── morphtree.py
│   │   ├── neuron_checks.py
│   │   └── runner.py
│   ├── core
│   │   ├── dataformat.py
│   │   ├── __init__.py
│   │   ├── morphology.py
│   │   ├── neuron.py
│   │   ├── population.py
│   │   ├── soma.py
│   │   └── types.py
│   ├── exceptions.py
│   ├── features
│   │   ├── bifurcationfunc.py
│   │   ├── bifurcation.py
│   │   ├── __init__.py
│   │   ├── morphology.py
│   │   ├── neurite.py
│   │   ├── population.py
│   │   ├── sectionfunc.py
│   │   └── section.py
│   ├── geom
│   │   ├── __init__.py
│   │   └── transform.py
│   ├── __init__.py
│   ├── io
│   │   ├── __init__.py
│   │   └── utils.py
│   ├── morphmath.py
│   ├── neurom.egg-info
│   │   ├── dependency_links.txt
│   │   ├── entry_points.txt
│   │   ├── PKG-INFO
│   │   ├── requires.txt
│   │   ├── SOURCES.txt
│   │   └── top_level.txt
│   ├── stats.py
│   ├── utils.py
│   ├── view
│   │   ├── dendrogram.py
│   │   ├── __init__.py
│   │   ├── matplotlib_impl.py
│   │   ├── matplotlib_utils.py
│   │   └── plotly_impl.py
│   └── viewer.py
├── PKG-INFO
├── pylintrc
├── pyproject.toml
├── README.md
├── setup.cfg
├── setup.py
└── tox.ini

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only include=["neurom"] seems to be doing the trick..

namespaces = false

[tool.setuptools.package-data]
"*" = ["morph_check.yaml", "morph_stats.yaml"]

[tool.setuptools_scm]
local_scheme = "no-local-version"
12 changes: 11 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ envlist =
docs
coverage
tutorial
check-packaging
py{38,39,310,311,312}

[testenv]
Expand Down Expand Up @@ -59,6 +60,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

Expand All @@ -70,5 +80,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
Loading