From 4d7b0f5d49287d89433ac323111753a224dbcd25 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Mon, 8 Dec 2025 12:53:53 -0600 Subject: [PATCH 1/9] Bump prepatch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b7b44b86..115b43d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "diffsync" -version = "2.2.0" +version = "2.2.1a0" description = "Library to easily sync/diff/update 2 different data sources" authors = ["Network to Code, LLC "] license = "Apache-2.0" From cab4270aab0393dca2e23f2441bea9d80207a0c1 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 07:58:15 -0600 Subject: [PATCH 2/9] Fix CI (#321) --- .github/workflows/release.yml | 2 +- changes/321.housekeeping | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/321.housekeeping diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee870479..bdb33f71 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: python-version: "3.13" poetry-install-options: "--no-root" - name: "Build Documentation" - run: "poetry run invoke build-and-check-docs" + run: "poetry run invoke build build-and-check-docs" - name: "Run Poetry Build" run: "poetry build" diff --git a/changes/321.housekeeping b/changes/321.housekeeping new file mode 100644 index 00000000..044f8618 --- /dev/null +++ b/changes/321.housekeeping @@ -0,0 +1 @@ +Fixed CI release workflow. From 35c6a7a89e2057e90b5e04cb863c7f8b4fd39aa2 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 10:26:10 -0600 Subject: [PATCH 3/9] ci: Can't use Trusted Publisher so reverting to old publishing pattern --- .github/workflows/release.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdb33f71..e23cd01d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,18 +58,17 @@ jobs: if: "startsWith(github.ref, 'refs/tags/v')" needs: "build" environment: "pypi" - permissions: - # IMPORTANT: this permission is mandatory for Trusted Publishing - id-token: "write" steps: - name: "Retrieve built package from cache" uses: "actions/download-artifact@v4" with: name: "distfiles" path: "dist/" - - - name: "Publish package distributions to PyPI" - uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0 + - name: "Push to PyPI" + uses: "pypa/gh-action-pypi-publish@release/v1" + with: + user: "__token__" + password: "${{ secrets.PYPI_API_TOKEN }}" slack-notify: needs: From c7db8a627d1d22ccc99efa23793de8483e52a4c1 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 10:28:20 -0600 Subject: [PATCH 4/9] Add changelog --- changes/323.housekeeping | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/323.housekeeping diff --git a/changes/323.housekeeping b/changes/323.housekeeping new file mode 100644 index 00000000..6a862e0f --- /dev/null +++ b/changes/323.housekeeping @@ -0,0 +1 @@ +Reverted PyPI publishing method. From c756e21050dbf8e7d8962ce55fa71a3500af9cb9 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 10:53:08 -0600 Subject: [PATCH 5/9] Use commit --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e23cd01d..a4b05ba1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: name: "distfiles" path: "dist/" - name: "Push to PyPI" - uses: "pypa/gh-action-pypi-publish@release/v1" + uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" with: user: "__token__" password: "${{ secrets.PYPI_API_TOKEN }}" @@ -88,7 +88,7 @@ jobs: steps: - name: "Send a notification to Slack" if: "${{ env.SLACK_WEBHOOK_URL != '' }}" - uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 + uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 with: payload: | { From 883e95e7bb66ea93f6418bb55c4b60b72e64c169 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 11:11:37 -0600 Subject: [PATCH 6/9] Fix spacing again --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4b05ba1..9d35f7ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,7 +88,7 @@ jobs: steps: - name: "Send a notification to Slack" if: "${{ env.SLACK_WEBHOOK_URL != '' }}" - uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 + uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 with: payload: | { From 4de9885b4958b5ac617fd39ac97306d60c07ab0d Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 11:18:08 -0600 Subject: [PATCH 7/9] Revert name for step and comment version for sha --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d35f7ed..176610f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,8 +64,8 @@ jobs: with: name: "distfiles" path: "dist/" - - name: "Push to PyPI" - uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" + - name: "Publish package distribution to PyPI" + uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0 with: user: "__token__" password: "${{ secrets.PYPI_API_TOKEN }}" @@ -88,7 +88,7 @@ jobs: steps: - name: "Send a notification to Slack" if: "${{ env.SLACK_WEBHOOK_URL != '' }}" - uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 + uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 with: payload: | { From db6224f979e15574ba8472f64a47ae0190b1e0be Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 11:19:45 -0600 Subject: [PATCH 8/9] Again --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 176610f7..99b60bd9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,7 +88,7 @@ jobs: steps: - name: "Send a notification to Slack" if: "${{ env.SLACK_WEBHOOK_URL != '' }}" - uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 + uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1 with: payload: | { From 35268e183a5e7e8cb96da9f868d02e74b3d30a58 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 11:56:29 -0600 Subject: [PATCH 9/9] Revert version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 115b43d2..b7b44b86 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "diffsync" -version = "2.2.1a0" +version = "2.2.0" description = "Library to easily sync/diff/update 2 different data sources" authors = ["Network to Code, LLC "] license = "Apache-2.0"