From d76de5590466a37e4da32d160bf44cb3a9af4761 Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:29:32 +0100 Subject: [PATCH 1/6] Same syntax as OF-France --- .github/has-functional-changes.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/has-functional-changes.sh b/.github/has-functional-changes.sh index 3947bf80..fd64f3ac 100755 --- a/.github/has-functional-changes.sh +++ b/.github/has-functional-changes.sh @@ -10,6 +10,5 @@ if git diff-index --name-only --exit-code $last_tagged_commit -- . `echo " $IGNO then echo "No functional changes detected." exit 1 -else - echo "The functional files above were changed." +else echo "The functional files above were changed." fi From e711f6ef07bd6a2427f6a8b560f5dff520acff1f Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:05:58 +0100 Subject: [PATCH 2/6] wip : debug error --- .github/has-functional-changes.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/has-functional-changes.sh b/.github/has-functional-changes.sh index fd64f3ac..97e0bec1 100755 --- a/.github/has-functional-changes.sh +++ b/.github/has-functional-changes.sh @@ -6,9 +6,11 @@ IGNORE_DIFF_ON="README.md CONTRIBUTING.md Makefile .gitignore .github/* .conda/* 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 +echo "Last tagged commit: $last_tagged_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 +echo "The functional files above were changed." From ce283d80e1c0d89f224883ade26a3702f8137cd7 Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:15:33 +0100 Subject: [PATCH 3/6] Add exit 0 --- .github/has-functional-changes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/has-functional-changes.sh b/.github/has-functional-changes.sh index 97e0bec1..a992dfee 100755 --- a/.github/has-functional-changes.sh +++ b/.github/has-functional-changes.sh @@ -14,3 +14,4 @@ then exit 1 fi echo "The functional files above were changed." +exit 0 From 5b12e262400e852b5e15d978c7e29306001ce052 Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:21:11 +0100 Subject: [PATCH 4/6] Update actions versions --- .github/workflows/workflow.yml | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 866dea4e..11877ced 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,14 +15,14 @@ jobs: python-version: ["3.9.9", "3.10.6"] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Cache build id: restore-build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }} @@ -33,7 +33,7 @@ jobs: run: make build - name: Cache release id: restore-release - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: dist key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }} @@ -42,16 +42,16 @@ jobs: runs-on: ubuntu-20.04 needs: [ build ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all the tags - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9.9 - name: Cache build id: restore-build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04 @@ -72,14 +72,14 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Cache build id: restore-build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }} @@ -100,14 +100,14 @@ jobs: # os: [ "ubuntu-20.04" ] # On peut ajouter "macos-latest" si besoin # python-version: ["3.9.9"] # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 # - name: Set up Python # uses: actions/setup-python@v3 # with: # python-version: ${{ matrix.python-version }} # - name: Cache build # id: restore-build - # uses: actions/cache@v3 + # uses: actions/cache@v4 # with: # path: ${{ env.pythonLocation }} # key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }} @@ -118,11 +118,11 @@ jobs: runs-on: ubuntu-20.04 needs: [ lint-files, build ] # TODO: Replace build by test-python steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all the tags - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9.9 - name: Check version number has been properly updated @@ -138,11 +138,11 @@ jobs: outputs: status: ${{ steps.stop-early.outputs.has_functional_changes_status }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all the tags - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9.9 - id: stop-early @@ -156,22 +156,22 @@ jobs: PYPI_USERNAME: openfisca-bot PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all the tags - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9.9 - name: Cache build id: restore-build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04 - name: Cache release id: restore-release - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: dist key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04 @@ -191,7 +191,7 @@ jobs: # Add openfisca channel for OpenFisca-Core channels: conda-forge, openfisca activate-environment: true - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all the tags - name: Conda config @@ -214,7 +214,7 @@ jobs: # Add openfisca channel for OpenFisca-Core channels: conda-forge, openfisca activate-environment: true - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all the tags - name: Install with conda From bb889e27e04bc35e2a47d3862b8d3f3d49d9ec15 Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:36:39 +0100 Subject: [PATCH 5/6] Remove dead code --- .github/workflows/workflow.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 11877ced..09c5d164 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -70,7 +70,6 @@ jobs: env: # Needed for coveralls GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - uses: actions/checkout@v4 - name: Set up Python @@ -90,30 +89,6 @@ jobs: - name : coverage run: coveralls --service=github - # Coverage will need GITHUB_TOKEN : "Running on Github Actions but GITHUB_TOKEN is not set." - # coverage: - # runs-on: ${{ matrix.os }} - # needs: [ build ] - # strategy: - # fail-fast: true - # matrix: - # os: [ "ubuntu-20.04" ] # On peut ajouter "macos-latest" si besoin - # python-version: ["3.9.9"] - # steps: - # - uses: actions/checkout@v4 - # - name: Set up Python - # uses: actions/setup-python@v3 - # with: - # python-version: ${{ matrix.python-version }} - # - name: Cache build - # id: restore-build - # uses: actions/cache@v4 - # with: - # path: ${{ env.pythonLocation }} - # key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }} - # - name : coverage - # run: coveralls - check-version-and-changelog: runs-on: ubuntu-20.04 needs: [ lint-files, build ] # TODO: Replace build by test-python From cf6882422f61ebff9226dd3f08848e66c13ea6ad Mon Sep 17 00:00:00 2001 From: benoit-cty <4-benoit-cty@users.noreply.git.leximpact.dev> Date: Tue, 13 Feb 2024 08:50:08 +0100 Subject: [PATCH 6/6] Bump --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 487f34a7..42fac67f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +# 2.0.6 [#291](https://github.com/openfisca/openfisca-survey-manager/pull/291) + +* Technical changes + - Fix the script check-version-and-changelog.sh to fix issue #288 + - Upgrade CI actions + +# 2.0.5 [#286](https://github.com/openfisca/openfisca-survey-manager/pull/286) + +* New features + - Allows sub-annual weighted aggregates in compute_aggregate when the weights are annual. + # 2.0.4 [#283](https://github.com/openfisca/openfisca-survey-manager/pull/283) - Correction function compute_pivot_tables in ReformScenario diff --git a/setup.py b/setup.py index dc3b0d53..e19c3f52 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setup( name = 'OpenFisca-Survey-Manager', - version = '2.0.4', + version = '2.0.6', author = 'OpenFisca Team', author_email = 'contact@openfisca.fr', classifiers = [classifier for classifier in classifiers.split('\n') if classifier],