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.

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

build: update openfisca-core to 42.0.0 #302

Merged
merged 4 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

## 2.2.1 [#298](https://github.com/openfisca/openfisca-survey-manager/pull/298)
### 2.2.2 [#302](https://github.com/openfisca/openfisca-survey-manager/pull/302)

* Minor change.
- Update OpenFisca-Core to 42.0.0

### 2.2.1 [#298](https://github.com/openfisca/openfisca-survey-manager/pull/298)

* For `compute_aggregate`, replace the warning by an assert when `weighted = True` (the default) and no weight is defined for the variable. Before, a warning was displayed and the aggregate was computed using uniform weights.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: test

uninstall:
pip freeze | grep -v "^-e" | xargs pip uninstall -y
pip freeze | grep -v "^-e" | sed "s/@.*//" | xargs pip uninstall -y

clean:
rm -rf build dist
Expand Down
2 changes: 1 addition & 1 deletion openfisca_survey_manager/simulations.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from openfisca_core.memory_config import MemoryConfig
from openfisca_core.indexed_enums import Enum
from openfisca_core.periods import ETERNITY, MONTH, YEAR
from openfisca_core.types import Array, Entity, Period, TaxBenefitSystem
from openfisca_core.types import Array, CoreEntity as Entity, Period, TaxBenefitSystem
from openfisca_core.simulations import Simulation
from openfisca_survey_manager.simulation_builder import diagnose_variable_mismatch, SimulationBuilder
from openfisca_survey_manager.survey_collections import SurveyCollection
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

setup(
name = 'OpenFisca-Survey-Manager',
version = '2.2.1',
version = '2.2.2',
author = 'OpenFisca Team',
author_email = '[email protected]',
classifiers = [classifier for classifier in classifiers.split('\n') if classifier],
Expand Down Expand Up @@ -64,8 +64,8 @@
'flake8-docstrings >=1.7.0, < 2.0',
'flake8-print >=5.0.0, < 6.0',
'flake8-rst-docstrings >=0.3.0, < 0.4.0',
'openfisca-country-template >=6.0.2 , <7 ',
'pytest >=7.2.2, < 8.0',
'openfisca-country-template >=7.1.5, <8.0.0',
'pytest >=8.3.3, < 9.0',
'pytest-cov >=4.0.0, < 5.0',
'scipy >=1.10.1, < 2.0',
'pytest-order >=1.1.0, <2.0',
Expand All @@ -87,7 +87,7 @@
'chardet >=5.1.0, < 6.0',
'configparser >=5.3.0, < 6.0',
'humanize >=4.6.0, < 5.0',
'openfisca-core >=41.1.0, < 42.0',
'openfisca-core >=42.0.0, <43.0.0',
'pandas >=2.0.3, < 3.0',
'pyarrow >=13.0.0, < 14.0.0',
'pyxdg >=0.28, < 0.29',
Expand Down