From e2818858a908645251a581b0846acc482a118f25 Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:56:11 +0200 Subject: [PATCH 1/3] Add event: push in conda CI --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d956bdbf..c0412338 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -260,6 +260,7 @@ jobs: commit: ${{steps.last_pr_commit.outputs.result}} name: conda-build-${{ env.PACKAGE_VERSION }}-${{steps.last_pr_commit.outputs.result}} path: conda-build-tmp + event: push # To avoid conflict with PR workflow if_no_artifact_found: fail - name: Conda upload # This shell is made necessary by https://github.com/conda-incubator/setup-miniconda/issues/128 From 5ceaf4df7a2b024e5e32080cc7cef7198013eb08 Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:30:13 +0200 Subject: [PATCH 2/3] bump version 2.0.0 -> 2.0.1 --- .conda/meta.yaml | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index 6fc30fa5..e8b167e0 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -4,7 +4,7 @@ ############################################################################### {% set name = "openfisca-france-data" %} -{% set version = "0.23.1" %} +{% set version = "2.0.1" %} package: name: {{ name|lower }} diff --git a/setup.cfg b/setup.cfg index 1b70d92b..87f080f8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ testpaths = tests python_files = **/*.py [bumpver] -current_version = "0.23.1" +current_version = "2.0.1" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "bump version {old_version} -> {new_version}" commit = True diff --git a/setup.py b/setup.py index 100c9ae5..f0bf46e5 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name = "OpenFisca-France-Data", - version = "2.0.0", + version = "2.0.1", description = "OpenFisca-France-Data module to work with French survey data", long_description = long_description, long_description_content_type="text/markdown", From 06fc98ae46acfcf16ca948fe8143c98fabd9548c Mon Sep 17 00:00:00 2001 From: benoit-cty <6603048+benoit-cty@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:31:14 +0200 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f2d09eb..926ae506 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 2.0.1 [#232](https://github.com/openfisca/openfisca-france-data/pull/232) +* Technical changes +- Fix de #230 qui se produit quand le wokflow de CI a tourné deux fois pour le même commit, ce qui arrive quand on crée la PR. La solution est de limiter la recherche de l’artefact aux workflows lancés par un push. + # 2.0.0 [#229](https://github.com/openfisca/openfisca-france-data/pull/229) * Technical changes - Met à jour Python dans le setup pour compatibilité conda