From 93f9bea78bbc1b8fdb67e636a79675cafea61c15 Mon Sep 17 00:00:00 2001 From: Mauko Quiroga Date: Mon, 14 Oct 2024 12:11:26 +0200 Subject: [PATCH] chore!: version bump (fixes #1271 #1267 #1233) BREAKING_CHANGE: This changeset has not breaking changes to the `indexed_enums` public API. However, as a conservative measure concerning data preparation for large population simulations, it has been marked as a major release. Fixes #1271 Fixes #1267 Fixes #1233 --- .conda/openfisca-country-template/recipe.yaml | 5 ++-- .../openfisca-extension-template/recipe.yaml | 5 ++-- CHANGELOG.md | 27 +++++++------------ setup.py | 4 +-- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/.conda/openfisca-country-template/recipe.yaml b/.conda/openfisca-country-template/recipe.yaml index 7b75cf22c..7161c5fe2 100644 --- a/.conda/openfisca-country-template/recipe.yaml +++ b/.conda/openfisca-country-template/recipe.yaml @@ -13,8 +13,9 @@ source: sha256: b2f2ac9945d9ccad467aed0925bd82f7f4d5ce4e96b212324cd071b8bee46914 build: + number: 1 noarch: python - script: pip install . -v + script: pip install . -v --no-deps requirements: host: @@ -25,7 +26,7 @@ requirements: run: - numpy - python - - openfisca-core >=42,<43 + - openfisca-core >=42,<44 tests: - python: diff --git a/.conda/openfisca-extension-template/recipe.yaml b/.conda/openfisca-extension-template/recipe.yaml index 03e53d5dd..372f829d3 100644 --- a/.conda/openfisca-extension-template/recipe.yaml +++ b/.conda/openfisca-extension-template/recipe.yaml @@ -13,8 +13,9 @@ source: sha256: e16ee9cbefdd5e9ddc1c2c0e12bcd74307c8cb1be55353b3b2788d64a90a5df9 build: + build: 1 noarch: python - script: pip install . -v + script: pip install . -v --no-deps requirements: host: @@ -25,7 +26,7 @@ requirements: run: - numpy - python - - openfisca-country-template >=7,<8 + - openfisca-country-template >=7.1.5,<8 tests: - python: diff --git a/CHANGELOG.md b/CHANGELOG.md index b7a2683e1..549588caf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,25 @@ # Changelog -### 42.1.1 [#1224](https://github.com/openfisca/openfisca-core/pull/1224) +# 43.0.0 [#1224](https://github.com/openfisca/openfisca-core/pull/1224) #### Technical changes +- Add documentation to the `indexed_enums` module - Fix type definitions in the enums module - -## 42.1.0 [#1273](https://github.com/openfisca/openfisca-core/pull/1273) +- Fix doctests +- Fix bug in `Enum.encode` when passing a scalar +- Fix bug in `Enum.encode` when encoding values not present in the enum #### New features - Introduce `indexed_enums.EnumType` - Allows for actually fancy indexing `indexed_enums.Enum` -#### Technical changes +#### Note -- Fix doctests - - Now `pytest openfisca_core/indexed_enums` runs without errors -- Fix bug in `Enum.encode` when passing a scalar - - Still raises `TypeError` but with an explanation of why it fails -- Fix bug in `Enum.encode` when encoding values not present in the enum - - When encoding values not present in an enum, `Enum.encode` always encoded - the first item of the enum - - Now, it correctly encodes only the values requested that exist in the enum +This changeset has not breaking changes to the `indexed_enums` public API. +However, as a conservative measure concerning data preparation for large +population simulations, it has been marked as a major release. ##### Before @@ -53,12 +50,6 @@ TestEnum.encode([0,1,2,5]) # EnumArray([ ]) ``` -### 42.0.8 [#1272](https://github.com/openfisca/openfisca-core/pull/1272) - -#### Documentation - -- Add documentation to the `indexed_enums` module - ### 42.0.7 [#1264](https://github.com/openfisca/openfisca-core/pull/1264) #### Technical changes diff --git a/setup.py b/setup.py index 350654ba3..d20cd6bb8 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ "StrEnum >=0.4.8, <0.5.0", # 3.11.x backport "dpath >=2.1.4, <3.0", "numexpr >=2.10.1, <3.0", - "numpy >=1.24.3, <2.0", + "numpy >=1.24.2, <2.0", "pendulum >=3.0.0, <4.0.0", "psutil >=5.9.4, <6.0", "pytest >=8.3.3, <9.0", @@ -69,7 +69,7 @@ setup( name="OpenFisca-Core", - version="42.1.1", + version="43.0.0", author="OpenFisca Team", author_email="contact@openfisca.org", classifiers=[