Merge pull request #201 from eEcoLiDAR/fix-packages-find

Fix subpackages

Author: fnattino

.zenodo.json

@@ -59,7 +59,7 @@
   "license": {
     "id": "Apache-2.0"
   },
-  "publication_date": "2025-03-24",
+  "publication_date": "2026-03-03",
   "title": "Laserchicken: toolkit for ALS point clouds",
-  "version": "0.8.0"
+  "version": "0.8.1"
 }

CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.8.1 - 2026-03-03
+
+## Changed
+
+- updated CITATION.cff to version 1.2
+
+## Fixed
+
+- fixed package discovery - 0.8.0 build on PyPI is broken
+- fixed test path in project metadata
+- release instructions have been updated to new tool versions
+
 ## 0.8.0 - 2026-03-03
 
 ## Added

CITATION.cff

@@ -1,66 +1,66 @@
-# YAML 1.2
----
-abstract: "Laserchicken is a toolkit for handling point clouds created using airborne laser scanning (ALS). Find neighboring points in your point cloud and describe them as feature values. Read our user manual and our (very modest) tutorial."
+# This CITATION.cff file was generated with cffinit.
+
+cff-version: 1.2.0
+title: 'Laserchicken: toolkit for ALS point clouds'
+message: >-
+  If you use this software, please cite it using these
+  metadata.
+type: software
 authors:
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Meijer
     given-names: Christiaan
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Goncalves
     given-names: Romulo
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Renaud
     given-names: Nico
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Andela
     given-names: Bouwe
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Dzigan
     given-names: Yifat
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Diblen
     given-names: Faruk
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Ranguelova
     given-names: Elena
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Oord
     given-names: Gijs
-    name-particle: "van den"
-  -
-    affiliation: "Netherlands eScience Center"
+    name-particle: van den
+  - affiliation: Netherlands eScience Center
     family-names: Grootes
-    given-names: "Meiert W."
-  -
-    affiliation: "Netherlands eScience Center"
+    given-names: Meiert W.
+  - affiliation: Netherlands eScience Center
     family-names: Nattino
     given-names: Francesco
-  -
-    affiliation: "Netherlands eScience Center"
+  - affiliation: Netherlands eScience Center
     family-names: Ku
     given-names: Ou
-  -
-    affiliation: "Institute for Biodiversity and Ecosystem Dynamics, University of Amsterdam"
+  - affiliation: >-
+      Institute for Biodiversity and Ecosystem Dynamics,
+      University of Amsterdam
     family-names: Koma
     given-names: Zsófia
-cff-version: "1.0.3"
-date-released: 2025-03-24
-doi: "10.5281/zenodo.1219422"
+identifiers:
+  - type: doi
+    value: 10.5281/zenodo.1219422
+    description: Zenodo
+abstract: >-
+  Laserchicken is a toolkit for handling point clouds
+  created using airborne laser scanning (ALS). Find
+  neighboring points in your point cloud and describe them
+  as feature values. Read our user manual and our (very
+  modest) tutorial.
 keywords:
-  - "airborne laser scanning"
-  - "machine learning"
-  - "point cloud"
-  - "digital terrain map"
-license: "Apache-2.0"
-message: "If you use this software, please cite it using these metadata."
-title: "Laserchicken: toolkit for ALS point clouds"
-version: "0.8.0"
-...
+  - airborne laser scanning
+  - machine learning
+  - point cloud
+  - digital terrain map
+license: Apache-2.0
+version: 0.8.1
+date-released: '2026-03-03'

README.md

@@ -20,19 +20,18 @@ pip install laserchicken
 ```
 
 #### Necessary steps for making a new release
-* Check citation.cff using general DOI for all version (option: create file via 'cffinit')
+
+* Set new version number in the following files:
+  * `laserchicken/__version__.py`
+  * `pyproject.toml`
+  * `CITATION.cff`
 * Create .zenodo.json file from CITATION.cff (using cffconvert)
 ```cffconvert --validate```
-```cffconvert --ignore-suspect-keys --outputformat zenodo --outfile .zenodo.json```
-* Set new version number in `laserchicken/__version__.py` and `pyproject.toml`
+```cffconvert --format zenodo --outfile .zenodo.json```
 * Check that documentation uses the correct version
 * Edit Changelog (based on commits in https://github.com/eecolidar/laserchicken/compare/v0.3.2...master)
 * Test if package can be installed with pip (`pip install .`)
-* Create Github release
-* Upload to pypi (now implemented via GitHub Actions):
-```python setup.py sdist bdist_wheel```
-```python -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/*```
-(or ```python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*``` to test first)
+* Create Github release (release to PyPI is implemented via GitHub Actions)
 * Check doi on zenodo
 
 

laserchicken/__version__.py

@@ -1 +1 @@
-__version__ = '0.8.0'
+__version__ = '0.8.1'

pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=80"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "laserchicken"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
     "laspy[lazrs]",
     "scipy>=0.11",
@@ -70,8 +70,8 @@ docs = [
     "recommonmark",
 ]
 
-[tool.setuptools]
-packages = ["laserchicken"]
+[tool.setuptools.packages.find]
+namespaces = false
 
 [project.scripts]
 laserchicken = "laserchicken.tools.cli:main"
@@ -80,9 +80,9 @@ laserchicken = "laserchicken.tools.cli:main"
 minversion = "6.0"
 addopts = "--cov=laserchicken --cov-report xml:coverage.xml --cov-report=term"
 testpaths = [
-    "tests",
+    "laserchicken",
 ]
 
 [tool.coverage.run]
 branch = true
-source = ["laserchicken"]
+source = ["laserchicken"]