Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
bonjourmauko committed Jan 24, 2023
1 parent 76856d6 commit 51272ee
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 68 deletions.
63 changes: 35 additions & 28 deletions .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,24 @@ requirements:
- python
- pip
run:
- python >=3.7,<4.0
- dpath >=1.5.0,<3.0.0
- nptyping ==1.4.4
- numexpr >=2.7.0,<=3.0
- numpy >=1.20,<1.21
- psutil >=5.4.7,<6.0.0
- pytest >=4.4.1,<6.0.0
- PyYAML >=3.10
- sortedcontainers ==2.2.2
- typing-extensions >=4.0.0,<5.0.0
- python >= 3.7, < 4.0
- PyYAML >= 6.0.0, < 7.0.0
- dpath >= 2.1.0, < 3.0.0
- importlib-metadata < 4.3.0
- nptyping == 1.4.4
- numexpr >= 2.8.0, <= 3.0.0
- numpy >= 1.20, < 1.21
- psutil >= 5.9.0, < 6.0.0
- pytest >= 5.4.0, < 6.0.0
- sortedcontainers == 2.2.2
- typing-extensions >= 4.4.0, < 5.0.0

test:
imports:
- openfisca_core
- openfisca_core.commons
requires:
- pytest >=4.4.1,<6.0.0
- pytest >= 5.4.0, < 6.0.0
- pip
commands:
- pip check
Expand All @@ -61,11 +62,12 @@ outputs:
host:
- python
run:
- python >=3.7,<4.0
- flask ==1.1.4
- flask-cors ==3.0.10
- gunicorn >=20.0.0,<21.0.0
- werkzeug >=1.0.0,<2.0.0
- python >= 3.7, < 4.0
- markupsafe == 2.0.1
- flask == 1.1.4
- flask-cors == 3.0.10
- gunicorn >= 20.1.0, < 21.0.0
- werkzeug >= 1.0.0, < 2.0.0
- {{ pin_subpackage('openfisca-core', exact=True) }}

- name: openfisca-core-dev
Expand All @@ -75,18 +77,23 @@ outputs:
host:
- python
run:
- autopep8 >=1.4.0,<1.6.0
- coverage >=6.2.0,<7.0.0
- darglint ==1.8.0
- flake8 >=4.0.0,<4.1.0
- flake8-bugbear >=19.3.0,<20.0.0
- flake8-docstrings ==1.6.0
- flake8-print >=3.1.0,<4.0.0
- flake8-rst-docstrings ==0.2.3
- mypy ==0.910
- openfisca-country-template >=3.10.0,<4.0.0
- openfisca-extension-template >=1.2.0rc0,<2.0.0
- pylint ==2.10.2
- autopep8 >= 1.5.0, < 1.6.0
- coverage >= 6.5.0, < 7.0.0
- darglint == 1.8.0
- flake8 >= 4.0.0, < 4.1.0
- flake8-bugbear >= 19.8.0, < 20.0.0
- flake8-docstrings == 1.6.0
- flake8-print >= 3.1.0, < 4.0.0
- flake8-rst-docstrings == 0.2.3
- idna >= 3.4.0, < 4.0.0
- isort >= 5.11.0, < 6.0.0
- mypy == 0.910
- openapi-spec-validator >= 0.5.0, < 0.6.0
- pycodestyle >= 2.8.0, < 2.9.0
- pylint == 2.10.2
- xdoctest >= 1.1.0, < 2.0.0
- openfisca-country-template >= 5.0.0, < 6.0.0
- openfisca-extension-template >= 1.3.13, < 2.0.0
- {{ pin_subpackage('openfisca-core-api', exact=True) }}

about:
Expand Down
48 changes: 24 additions & 24 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@
#### Bug fix

- Do not install dependencies outside the `setup.py`
- Dependencies installed outside the `setup.py` are not taken into account by
- Dependencies installed outside the `setup.py` are not taken into account by
`pip`'s dependency resolver.
- In case of conflicting transient dependencies, the last library installed
- In case of conflicting transient dependencies, the last library installed
will "impose" its dependency version.
- This makes the installation and build of the library non-deterministic and
prone to unforeseen bugs caused by external changes in dependencies'
- This makes the installation and build of the library non-deterministic and
prone to unforeseen bugs caused by external changes in dependencies'
versions.

#### Note

A definite way to solve this issue is to clearly separate library dependencies
(with a `virtualenv`) and a universal dependency installer for CI requirements
A definite way to solve this issue is to clearly separate library dependencies
(with a `virtualenv`) and a universal dependency installer for CI requirements
(like `pipx`), taking care of:

- Always running tests inside the `virtualenv` (for example with `nox`).
- Always building outside of the `virtualenv` (for example with `poetry`
- Always building outside of the `virtualenv` (for example with `poetry`
installed by `pipx`).

Moreover, it is indeed even better to have a lock file for dependencies,
Moreover, it is indeed even better to have a lock file for dependencies,
using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

### 38.0.2 [#1178](https://github.com/openfisca/openfisca-core/pull/1178)
Expand All @@ -52,8 +52,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

# 38.0.0 [#989](https://github.com/openfisca/openfisca-core/pull/989)

> Note: Version `38.0.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `38.0.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### New Features
Expand All @@ -68,8 +68,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

### 37.0.2 [#1170](https://github.com/openfisca/openfisca-core/pull/1170)

> Note: Version `37.0.2` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `37.0.2` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### Technical changes
Expand All @@ -78,8 +78,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

### 37.0.1 [#1169](https://github.com/openfisca/openfisca-core/pull/1169)

> Note: Version `37.0.1` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `37.0.1` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### Technical changes
Expand All @@ -88,8 +88,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

# 37.0.0 [#1142](https://github.com/openfisca/openfisca-core/pull/1142)

> Note: Version `37.0.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `37.0.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### Deprecations
Expand All @@ -105,8 +105,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

# 36.0.0 [#1149](https://github.com/openfisca/openfisca-core/pull/1162)

> Note: Version `36.0.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `36.0.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### Breaking changes
Expand All @@ -117,8 +117,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

## 35.12.0 [#1160](https://github.com/openfisca/openfisca-core/pull/1160)

> Note: Version `35.12.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `35.12.0` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### New Features
Expand All @@ -127,8 +127,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

### 35.11.2 [#1166](https://github.com/openfisca/openfisca-core/pull/1166)

> Note: Version `35.11.2` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `35.11.2` has been unpublished as `35.11.1` introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### Technical changes
Expand All @@ -137,8 +137,8 @@ using `pip freeze`) or with tools providing such features (`pipenv`, etc.).

### 35.11.1 [#1165](https://github.com/openfisca/openfisca-core/pull/1165)

> Note: Version `35.11.1` has been unpublished as it introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> Note: Version `35.11.1` has been unpublished as it introduced a bug
> preventing users to load a tax-benefit system. Please use versions `38.0.2`
> and subsequents.
#### Bug fix
Expand Down
2 changes: 1 addition & 1 deletion openfisca_tasks/serve.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Serve the openfisca Web API.
api:
$(call print_help,$@:)
@$(call print_help,$@:)
@openfisca serve \
--country-package openfisca_country_template \
--extensions openfisca_extension_template
30 changes: 15 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,47 +26,47 @@
# functional and integration breaks caused by external code updates.

general_requirements = [
'PyYAML >= 3.10',
'dpath >= 1.5.0, < 3.0.0',
'PyYAML >= 6.0.0, < 7.0.0',
'dpath >= 2.1.0, < 3.0.0',
'importlib-metadata < 4.3.0', # Required for Python 3.7 and Flake8
'nptyping == 1.4.4',
'numexpr >= 2.7.0, <= 3.0',
'numexpr >= 2.8.0, <= 3.0.0',
'numpy >= 1.20, < 1.21',
'psutil >= 5.4.7, < 6.0.0',
'pytest >= 4.4.1, < 6.0.0', # For openfisca test
'psutil >= 5.9.0, < 6.0.0',
'pytest >= 5.4.0, < 6.0.0', # For openfisca test
'sortedcontainers == 2.2.2',
'typing-extensions >= 4.0.0, < 5.0.0',
'typing-extensions >= 4.4.0, < 5.0.0',
]

api_requirements = [
'markupsafe == 2.0.1', # While flask revision < 2
'flask == 1.1.4',
'flask-cors == 3.0.10',
'gunicorn >= 20.0.0, < 21.0.0',
'gunicorn >= 20.1.0, < 21.0.0',
'werkzeug >= 1.0.0, < 2.0.0',
]

dev_requirements = [
'autopep8 >= 1.4.0, < 1.6.0',
'coverage >= 6.2.0, < 7.0.0',
'autopep8 >= 1.5.0, < 1.6.0',
'coverage >= 6.5.0, < 7.0.0',
'darglint == 1.8.0',
'flake8 >= 4.0.0, < 4.1.0',
'flake8-bugbear >= 19.3.0, < 20.0.0',
'flake8-bugbear >= 19.8.0, < 20.0.0',
'flake8-docstrings == 1.6.0',
'flake8-print >= 3.1.0, < 4.0.0',
'flake8-rst-docstrings == 0.2.3',
'idna >= 3.4.0, < 4.0.0',
'isort >= 5.0.0, < 6.0.0',
'isort >= 5.11.0, < 6.0.0',
'mypy == 0.910',
'openapi-spec-validator >= 0.5.0, < 0.6.0',
'pycodestyle >= 2.8.0, < 2.9.0',
'pylint == 2.10.2',
'xdoctest >= 1.0.0, < 2.0.0',
'xdoctest >= 1.1.0, < 2.0.0',
] + api_requirements

setup(
name = 'OpenFisca-Core',
version = '38.0.3',
version = '39.0.0',
author = 'OpenFisca Team',
author_email = 'contact@openfisca.org',
classifiers = [
Expand Down Expand Up @@ -95,8 +95,8 @@
'web-api': api_requirements,
'dev': dev_requirements,
'ci': [
'build >= 0.9.0, < 1.0.0',
'coveralls >= 3.0.0, < 4.0.0',
'build >= 0.10.0, < 1.0.0',
'coveralls >= 3.3.0, < 4.0.0',
'twine >= 4.0.0, < 5.0.0',
'wheel < 1.0.0',
],
Expand Down

0 comments on commit 51272ee

Please sign in to comment.