From 3e19dd2b713863a30c2cc73adacbd1b399deae8b Mon Sep 17 00:00:00 2001
From: Mauko Quiroga <public@mauko.me>
Date: Fri, 4 Oct 2024 16:23:14 +0200
Subject: [PATCH] ci: fix deploy to PyPi

---
 .github/workflows/merge.yaml | 8 +++++++-
 openfisca_tasks/publish.mk   | 8 --------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
index 5c2b4c791..57e0bb80a 100644
--- a/.github/workflows/merge.yaml
+++ b/.github/workflows/merge.yaml
@@ -158,7 +158,13 @@ jobs:
     - name: Upload package to PyPi
       run: |
         source venv/bin/activate
-        make publish
+        twine upload dist/* --username $PYPI_USERNAME --password $PYPI_TOKEN
+
+    - name: Update version
+      run: |
+        source venv/bin/activate
+        git tag `python setup.py --version`
+        git push --tags  # update the repository version
 
     - name: Update doc
       run: |
diff --git a/openfisca_tasks/publish.mk b/openfisca_tasks/publish.mk
index 37e599b63..c511bd9c2 100644
--- a/openfisca_tasks/publish.mk
+++ b/openfisca_tasks/publish.mk
@@ -15,11 +15,3 @@ build:
 	@python -m pip uninstall --yes openfisca-core
 	@find dist -name "*.whl" -exec python -m pip install --no-deps {} \;
 	@$(call print_pass,$@:)
-
-## Upload to PyPi.
-publish:
-	@$(call print_help,$@:)
-	@python -m twine upload dist/* --username $PYPI_USERNAME --password $PYPI_TOKEN
-	@git tag `python setup.py --version`
-	@git push --tags  # update the repository version
-	@$(call print_pass,$@:)