From 64ba6872960513c1a56bf2fe99e072ed698f7ceb Mon Sep 17 00:00:00 2001 From: sandcha Date: Mon, 29 Apr 2024 12:43:24 +0200 Subject: [PATCH 1/5] Use PyPi token for authentication on CI deploy job --- .github/workflows/workflow.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 658d326..38fda9f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -133,8 +133,7 @@ jobs: needs: [ check-for-functional-changes ] if: needs.check-for-functional-changes.outputs.status == 'success' env: - PYPI_USERNAME: openfisca-bot - PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + PYPI_TOKEN_OPENFISCA_BOT: ${{ secrets.PYPI_TOKEN_OPENFISCA_BOT }} steps: - uses: actions/checkout@v2 with: @@ -156,6 +155,6 @@ jobs: path: dist key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }} - name: Upload a Python package to PyPi - run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD + run: twine upload dist/* --username __token__ --password $PYPI_TOKEN_OPENFISCA_BOT - name: Publish a git tag run: "${GITHUB_WORKSPACE}/.github/publish-git-tag.sh" From afbe64d0ca7b2e87a1fed0178bf8f63135278ae5 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Fri, 21 Jun 2024 15:41:14 +0200 Subject: [PATCH 2/5] Use PYPI_TOKEN secret in workflow --- .github/workflows/workflow.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 38fda9f..8148fe7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -132,8 +132,6 @@ jobs: runs-on: ubuntu-20.04 needs: [ check-for-functional-changes ] if: needs.check-for-functional-changes.outputs.status == 'success' - env: - PYPI_TOKEN_OPENFISCA_BOT: ${{ secrets.PYPI_TOKEN_OPENFISCA_BOT }} steps: - uses: actions/checkout@v2 with: @@ -155,6 +153,6 @@ jobs: path: dist key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }} - name: Upload a Python package to PyPi - run: twine upload dist/* --username __token__ --password $PYPI_TOKEN_OPENFISCA_BOT + run: twine upload dist/* --username __token__ --password ${{ secrets.PYPI_TOKEN }} - name: Publish a git tag run: "${GITHUB_WORKSPACE}/.github/publish-git-tag.sh" From cd78f7c417e5bb8b135278def2bf2bdd9abcd946 Mon Sep 17 00:00:00 2001 From: sandcha Date: Mon, 29 Apr 2024 12:59:20 +0200 Subject: [PATCH 3/5] Describe CI deploy update in CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be60df4..90e1624 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [#55](https://github.com/openfisca/extension-template/pull/55) + +* Technical improvement. +* Details: + - Use PyPi token for authentication on CI `deploy` job + - Allows for Python package upload since the 2FA enforcement on PyPi + ### 1.3.13 - [#53](https://github.com/openfisca/extension-template/pull/53) * Minor change. From ec4dcfdf44faa775b42d2293a27ad2ed5bbbdfe2 Mon Sep 17 00:00:00 2001 From: sandcha Date: Fri, 28 Jun 2024 17:05:55 +0200 Subject: [PATCH 4/5] Rename PYPI_TOKEN to PYPI_TOKEN_OPENFISCA_BOT in CI configuration --- .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 8148fe7..a5cd1d2 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -153,6 +153,6 @@ jobs: path: dist key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }} - name: Upload a Python package to PyPi - run: twine upload dist/* --username __token__ --password ${{ secrets.PYPI_TOKEN }} + run: twine upload dist/* --username __token__ --password ${{ secrets.PYPI_TOKEN_OPENFISCA_BOT }} - name: Publish a git tag run: "${GITHUB_WORKSPACE}/.github/publish-git-tag.sh" From 555746b36c3f7148a51ed8a2e6dcfaba63331448 Mon Sep 17 00:00:00 2001 From: Matti Schneider Date: Fri, 21 Jun 2024 15:42:33 +0200 Subject: [PATCH 5/5] Bump version --- CHANGELOG.md | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e1624..161c058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### [#55](https://github.com/openfisca/extension-template/pull/55) +### 1.3.14 - [#55](https://github.com/openfisca/extension-template/pull/55) * Technical improvement. * Details: diff --git a/setup.py b/setup.py index 3a7c586..625a4f3 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name = "OpenFisca-Extension-Template", - version = "1.3.13", + version = "1.3.14", author = "OpenFisca Team", author_email = "contact@openfisca.org", classifiers = [