From 1df36f08c65b7a8fae18f66ae11291dcf83c90ce Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Fri, 28 Jun 2024 18:13:35 +0100 Subject: [PATCH 1/8] Test with new rebase core --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 002c8ff..317a9f7 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ ], install_requires = [ "bottleneck >=1.3.2,<=2.0.0", - "OpenFisca-Core @ git+https://github.com/openfisca/openfisca-core@pension-rebased#egg=openfisca-core", + "OpenFisca-Core @ git+https://github.com/openfisca/openfisca-core@pension-rebase-2d#egg=openfisca-core", # "OpenFisca-Core >= 41.1,<42", "numba>=0.54,<1.0.0", "pandas>=2.0,<3.0", From 392872fe7212533c6b694afb93703ef555e31f8d Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Fri, 28 Jun 2024 18:32:09 +0100 Subject: [PATCH 2/8] Expand version matrix --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 69e65b0..ad4f4b7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -12,7 +12,7 @@ jobs: fail-fast: true matrix: os: ["ubuntu-20.04"] # On peut ajouter "macos-latest" si besoin - python-version: ["3.9.9"] + python-version: ["3.9.9", "3.10.6"] openfisca-dependencies: [minimal, maximal] steps: - name: Checkout From 848055285638c037c2c68c1a8d57a96bb7bea59f Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Fri, 28 Jun 2024 18:39:30 +0100 Subject: [PATCH 3/8] Remove circleci leftovers --- .circleci/config.yml | 96 ----------------------- .circleci/has-functional-changes.sh | 12 --- .circleci/is-version-number-acceptable.sh | 33 -------- .circleci/publish-git-tag.sh | 4 - 4 files changed, 145 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100755 .circleci/has-functional-changes.sh delete mode 100755 .circleci/is-version-number-acceptable.sh delete mode 100755 .circleci/publish-git-tag.sh diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8cd705f..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,96 +0,0 @@ -# CircleCI 2.0 configuration file. See . -version: 2 -jobs: - build: - docker: - - image: python:3.7 - - steps: - - checkout - - - restore_cache: - key: v1-py3-deps-{{ checksum "setup.py" }} - - - run: - name: Create a virtualenv - command: | - mkdir -p /tmp/venv/france-pension - python -m venv /tmp/venv/france-pension - echo "source /tmp/venv/france-pension/bin/activate" >> $BASH_ENV - - - run: - name: Install dependencies - command: | - make build - # pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH#egg=OpenFisca-Core[web-api] # use a specific branch of OpenFisca-Core - - - save_cache: - key: v1-py3-deps-{{ checksum "setup.py" }} - paths: - - /tmp/venv/france-pension - - - save_cache: - key: v1-py3-build-{{ .Revision }} - paths: - - dist - - - run: - name: Run tests - command: make test - - check_version: - docker: - - image: python:3.7 - - steps: - - checkout - - - run: - name: Check version number has been properly updated - command: | - git fetch - .circleci/is-version-number-acceptable.sh - - deploy: - docker: - - image: python:3.7 - environment: - PYPI_USERNAME: openfisca-bot # Edit this value to replace it by your Pypi username - # PYPI_PASSWORD: this value is set in CircleCI's web interface; do not set it here, it is a secret! - - steps: - - checkout - - - restore_cache: - key: v1-py3-deps-{{ checksum "setup.py" }} - - - restore_cache: - key: v1-py3-build-{{ .Revision }} - - - run: - name: Check for functional changes - command: if ! .circleci/has-functional-changes.sh ; then circleci step halt ; fi - - - run: - name: Upload a Python package to Pypi - command: | - source /tmp/venv/france-pension/bin/activate - twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD - - - run: - name: Publish a git tag - command: .circleci/publish-git-tag.sh - -workflows: - version: 2 - build_and_deploy: - jobs: - - build - - check_version - - deploy: - requires: - - build - - check_version - filters: - branches: - only: master diff --git a/.circleci/has-functional-changes.sh b/.circleci/has-functional-changes.sh deleted file mode 100755 index b787de9..0000000 --- a/.circleci/has-functional-changes.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash - -IGNORE_DIFF_ON="README.md CONTRIBUTING.md Makefile .gitignore .circleci/* .github/*" - -last_tagged_commit=`git describe --tags --abbrev=0 --first-parent` # --first-parent ensures we don't follow tags not published in master through an unlikely intermediary merge commit - -if git diff-index --name-only --exit-code $last_tagged_commit -- . `echo " $IGNORE_DIFF_ON" | sed 's/ / :(exclude)/g'` # Check if any file that has not be listed in IGNORE_DIFF_ON has changed since the last tag was published. -then - echo "No functional changes detected." - exit 1 -else echo "The functional files above were changed." -fi diff --git a/.circleci/is-version-number-acceptable.sh b/.circleci/is-version-number-acceptable.sh deleted file mode 100755 index ae370e2..0000000 --- a/.circleci/is-version-number-acceptable.sh +++ /dev/null @@ -1,33 +0,0 @@ -#! /usr/bin/env bash - -if [[ $CIRCLE_BRANCH == master ]] -then - echo "No need for a version check on master." - exit 0 -fi - -if ! $(dirname "$BASH_SOURCE")/has-functional-changes.sh -then - echo "No need for a version update." - exit 0 -fi - -current_version=`python setup.py --version` - -if git rev-parse --verify --quiet $current_version -then - echo "Version $current_version already exists in commit:" - git --no-pager log -1 $current_version - echo - echo "Update the version number in setup.py before merging this branch into master." - echo "Look at the CONTRIBUTING.md file to learn how the version number should be updated." - exit 1 -fi - -if ! $(dirname "$BASH_SOURCE")/has-functional-changes.sh | grep --quiet CHANGELOG.md -then - echo "CHANGELOG.md has not been modified, while functional changes were made." - echo "Explain what you changed before merging this branch into master." - echo "Look at the CONTRIBUTING.md file to learn how to write the changelog." - exit 2 -fi diff --git a/.circleci/publish-git-tag.sh b/.circleci/publish-git-tag.sh deleted file mode 100755 index 4450357..0000000 --- a/.circleci/publish-git-tag.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env bash - -git tag `python setup.py --version` -git push --tags # update the repository version From 0c03baf1805cea117585d941e58939f0b89556fd Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Fri, 28 Jun 2024 18:44:06 +0100 Subject: [PATCH 4/8] Roll back expand version --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ad4f4b7..69e65b0 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -12,7 +12,7 @@ jobs: fail-fast: true matrix: os: ["ubuntu-20.04"] # On peut ajouter "macos-latest" si besoin - python-version: ["3.9.9", "3.10.6"] + python-version: ["3.9.9"] openfisca-dependencies: [minimal, maximal] steps: - name: Checkout From 8bbbee9a85c6406b2b8c16e6a353dc3d299d518d Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 5 Aug 2024 15:33:57 +0200 Subject: [PATCH 5/8] Use new core version --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 317a9f7..4949083 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ description = "OpenFisca tax and benefit system for France-Pension", keywords = "benefit microsimulation social tax", license ="http://www.fsf.org/licensing/licenses/agpl-3.0.html", - # url = "https://github.com/openfisca/country-template", + url = "https://github.com/openfisca/openfisca-france-pension", include_package_data = True, # Will read MANIFEST.in data_files = [ ( @@ -30,8 +30,7 @@ ], install_requires = [ "bottleneck >=1.3.2,<=2.0.0", - "OpenFisca-Core @ git+https://github.com/openfisca/openfisca-core@pension-rebase-2d#egg=openfisca-core", - # "OpenFisca-Core >= 41.1,<42", + "OpenFisca-Core >= 41.5.0,<42", "numba>=0.54,<1.0.0", "pandas>=2.0,<3.0", ], From c439f1fbd3a15a2213e1e99da8f676d84e73b6a9 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 5 Aug 2024 16:09:21 +0200 Subject: [PATCH 6/8] Bump --- CHANGELOG.md | 7 ++++++- setup.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de69082..a1993ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,17 @@ # Changelog +## 0.0.6 [6](https://github.com/openfisca/openfisca-france-pension/pull/6) + +* Amélioration technique. +* Détails : + - Utilisation de la nouvelle version de openfisca-core intégrant les as-of-date parameters. + ## 0.0.2 [5](https://github.com/openfisca/openfisca-france-pension/pull/5) * Amélioration technique. * Détails : - Configuration de l'intégration continue - ## 0.0.1 First Draft diff --git a/setup.py b/setup.py index 4949083..4c1a209 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = "OpenFisca-France-Pension", python_requires='>=3.9', - version = "0.0.2", + version = "0.0.3", author = "OpenFisca Team", author_email = "contact@openfisca.org", classifiers=[ From cfd9cda876be233707040beb9fec0a2d1c2661b7 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 5 Aug 2024 16:54:17 +0200 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1993ca..d3732c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 0.0.6 [6](https://github.com/openfisca/openfisca-france-pension/pull/6) +## 0.0.3 [6](https://github.com/openfisca/openfisca-france-pension/pull/6) * Amélioration technique. * Détails : From 07bdba35fe1d5ee50e13161d4c1063e11104f5a0 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 5 Aug 2024 17:58:37 +0200 Subject: [PATCH 8/8] Modify changelog for validation --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3732c7..b539e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,4 +14,4 @@ ## 0.0.1 -First Draft +First draft