From 61c034c1d6ba95a968e2c1c5e3b550198b2d520c Mon Sep 17 00:00:00 2001 From: lrdossan Date: Wed, 4 Dec 2024 16:21:18 +0100 Subject: [PATCH 1/2] added manifest --- caimira/MANIFEST.in | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 caimira/MANIFEST.in diff --git a/caimira/MANIFEST.in b/caimira/MANIFEST.in new file mode 100644 index 00000000..448d9f26 --- /dev/null +++ b/caimira/MANIFEST.in @@ -0,0 +1,9 @@ +recursive-include src *.py +recursive-include src *.json +recursive-include src *.txt + +exclude *.pyc +exclude **/__pycache__/* +exclude tests/* +exclude docs/* +exclude *.md \ No newline at end of file From 04fb99848ac894dab73b29dc4850926c0de39885 Mon Sep 17 00:00:00 2001 From: lrdossan Date: Wed, 4 Dec 2024 16:21:33 +0100 Subject: [PATCH 2/2] increased version --- CHANGELOG.md | 11 +++++++++++ caimira/pyproject.toml | 6 +++--- caimira/setup.cfg | 2 -- cern_caimira/pyproject.toml | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 caimira/setup.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index c141cb48..6de89c0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# 4.17.6 (December 4, 2024) + +## Features Added +- Data registry update +- REST API adjustments in docs +- Release to PyPI + +## Bug Fixes +- Corrected user guide and about doc refs +- Minor fix in docker pre-built instruction + # 4.17.5 (November 21, 2024) ## Features Added diff --git a/caimira/pyproject.toml b/caimira/pyproject.toml index ff09c40a..122d38aa 100644 --- a/caimira/pyproject.toml +++ b/caimira/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "caimira" -version = "4.17.5" +version = "4.17.6" description = "CAiMIRA - CERN Airborne Model for Indoor Risk Assessment" readme = "README.md" license = { text = "Apache-2.0" } @@ -58,8 +58,8 @@ doc = [ [project.urls] Homepage = "https://gitlab.cern.ch/caimira/caimira" -[tool.setuptools.package-data] -caimira = ["**/*"] +[tool.setuptools.packages.find] +where = ["src"] [tool.pytest.ini_options] addopts = "--mypy" diff --git a/caimira/setup.cfg b/caimira/setup.cfg deleted file mode 100644 index 5d55bc97..00000000 --- a/caimira/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[tool:pytest] -addopts = --mypy diff --git a/cern_caimira/pyproject.toml b/cern_caimira/pyproject.toml index 13d5aff1..e88fcfc4 100644 --- a/cern_caimira/pyproject.toml +++ b/cern_caimira/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "cern-caimira" -version = "4.17.5" +version = "4.17.6" description = "CAiMIRA - CERN Airborne Model for Indoor Risk Assessment" license = { text = "Apache-2.0" } authors = [