Skip to content
Snippets Groups Projects
Commit bb26be44 authored by sandcha's avatar sandcha
Browse files

Merge branch 'bump-core' into 'master'

Met à jour OpenFisca-Core jusqu'à la v38

See merge request !28
parents 461798b3 f8dcaf67
Branches
Tags 1.0.0
1 merge request!28Met à jour OpenFisca-Core jusqu'à la v38
Pipeline #13415 skipped
# Python builds
# Python stuff
.python-version
## Python builds
*.egg-info
*.pyc
......@@ -22,3 +26,4 @@ dist
.DS_Store
*~
notebooks/.ipynb_checkpoints/
.venv/
......@@ -13,12 +13,12 @@ cache:
untracked: true
key: ${CI_COMMIT_REF_SLUG} # The branch or tag name
paths:
- venv/
- .venv/
- ./dist
before_script:
- source venv/bin/activate
- source .venv/bin/activate
dependencies:
stage: install
......@@ -26,10 +26,8 @@ dependencies:
before_script:
- ''
script:
- pip install -U pip setuptools
- pip install virtualenv
- virtualenv venv -ppython3
- source venv/bin/activate
- python -m venv .venv
- source .venv/bin/activate
- make install
check-style:
......
# Changelog
# 1.0.0 [!28](https://git.leximpact.dev/leximpact/simulateur-dotations-communes/openfisca-france-dotations-locales/-/merge_requests/28)
* Amélioration technique.
* Périodes concernées : toutes.
* Zones impactées : `setup.py`.
* Détails :
- Met à jour `OpenFisca-Core` à la dernière version compatible Python 3.7 ([v.38.0.4](https://github.com/openfisca/openfisca-core/tree/38.0.4))
- Met à jour les dépendances de `dev` en gérant les incompatibilités
- Corrige un `DtypeWarning` pour `test_data.py`
## 0.9.0 [!26](https://git.leximpact.dev/leximpact/openfisca-france-dotations-locales/-/merge_requests/26)
* Évolution du système socio-fiscal.
......
......@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
setup(
name = "OpenFisca-France-Dotations-Locales",
version = "0.9.0",
version = "1.0.0",
author = "LexImpact Team",
author_email = "leximpact@an.fr",
classifiers=[
......@@ -26,14 +26,15 @@ setup(
["CHANGELOG.md", "LICENSE", "README.md", "REFERENCES.md"]),
],
install_requires = [
"OpenFisca-Core[web-api] >=27.0,<36.0",
"OpenFisca-Core[web-api] >=27.0,<39.0",
],
extras_require = {
"dev": [
"pandas >= 0.24.0, < 0.25.0",
"autopep8 == 1.5",
"flake8 >= 3.5.0, < 3.8.0",
"pycodestyle >= 2.3.0, < 2.6.0", # To avoid incompatibility with flake
"pandas >= 1.3.5, < 2.0.0",
"twine >= 3.0.0, < 4.0.0", # [Python 3.7] To fix incompatibility on importlib-metadata between keyring (via twine) and openfisca-core (via Flake8)
"autopep8",
"flake8 >= 4.0.0, < 4.1.0",
"pycodestyle >=2.8.0, <2.11.0",
"jupyter >= 1.0.0, < 2.0.0"
]
},
......
......@@ -7,7 +7,7 @@ def test_csv_communes_criteres_repartition():
communes_criteres_repartition_2019 = pandas.read_csv(
csv_communes_criteres_repartition,
decimal=",")
decimal=",", low_memory=False)
assert len(communes_criteres_repartition_2019["Informations générales - Nom de la commune"]) == 35056
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment