From fe5126e892e44a581f9c93d48852e4af03c2222c Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Tue, 7 May 2024 14:26:07 +0200 Subject: [PATCH 1/3] Use version specifiers compatible with Conda According to https://github.com/openfisca/openfisca-france/pull/2298/commits/196c469832180b264d339a0c3a32537d5e1461e8, generating conda.yaml fails if specifiers contain a space --- pyproject.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6ba3c09..c61a2db 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,9 +14,9 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Topic :: Scientific/Engineering :: Information Analysis", ] -requires-python = ">= 3.9" +requires-python = ">=3.9" dependencies = [ - "openfisca-core[web-api] >= 41.0.0, < 42.0.0" + "openfisca-core[web-api] >=41.0.0, <42.0.0" ] [project.urls] @@ -28,12 +28,12 @@ Changelog = "https://github.com/openfisca/country-template/blob/main/CHANGELOG.m [project.optional-dependencies] dev = [ - "autopep8 >= 2.0.4", - "flake8 >= 7.0.0", - "isort >= 5.13.2", - "pylint >= 3.1.0", - "pyupgrade >= 3.15.1", - "yamllint >= 1.35.1" + "autopep8 >=2.0.4", + "flake8 >=7.0.0", + "isort >=5.13.2", + "pylint >=3.1.0", + "pyupgrade >=3.15.1", + "yamllint >=1.35.1" ] [tool.pytest.ini_options] From 157461447ccdcb2b4126c053ba82b3ded800cfa5 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Tue, 7 May 2024 14:26:39 +0200 Subject: [PATCH 2/3] Update Core dependency Require a version that can parse pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c61a2db..5656481 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ classifiers = [ ] requires-python = ">=3.9" dependencies = [ - "openfisca-core[web-api] >=41.0.0, <42.0.0" + "openfisca-core[web-api] >=41.4.5, <42.0.0" ] [project.urls] From 823869c7e91e60bf45b887a0d37a0b98dd140b22 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Tue, 7 May 2024 14:35:34 +0200 Subject: [PATCH 3/3] Bump version number and changelog --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd91df..251fe11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### 7.1.1 [#146](https://github.com/openfisca/country-template/pull/146) + +* Technical improvement +* Details: + - Update minimal Core dependency to require a version that can parse `pyproject.toml` (see https://github.com/openfisca/openfisca-core/pull/1209) + - Use version specifiers compatible with Conda packaging + ## 7.1.0 [#143](https://github.com/openfisca/country-template/pull/143) * Technical improvement diff --git a/pyproject.toml b/pyproject.toml index 5656481..73e06bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "openfisca-country_template" -version = "7.1.0" +version = "7.1.1" description = "OpenFisca Rules as Code model for Country-Template." readme = "README.md" keywords = ["microsimulation", "tax", "benefit", "rac", "rules-as-code"]