From 188bf7968bfefdef9a20f6dd46dc31e4da5a0c6e Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 10:00:17 -0600 Subject: [PATCH 1/3] Fix CI (#322) * Bump prepatch * Fix CI (#321) * Bump version back down for release --- .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 899d9769b3465903dd244352f25b68d44f230dad Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 12:05:39 -0600 Subject: [PATCH 2/3] Revert PyPI Publishing (#323) * Bump prepatch * Fix CI (#321) * ci: Can't use Trusted Publisher so reverting to old publishing pattern * Add changelog * Use commit * Fix spacing again * Revert name for step and comment version for sha * Again * Revert version --- .github/workflows/release.yml | 9 ++++----- changes/323.housekeeping | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 changes/323.housekeeping diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdb33f71..99b60bd9 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" + - name: "Publish package distribution to PyPI" uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e" # v1.13.0 + with: + user: "__token__" + password: "${{ secrets.PYPI_API_TOKEN }}" slack-notify: needs: 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 3d614ca18699da7fab5c08d17e56e95332a65b57 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 12 Dec 2025 12:10:55 -0600 Subject: [PATCH 3/3] Bump prepatch --- changes/321.housekeeping | 1 - changes/323.housekeeping | 1 - pyproject.toml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 changes/321.housekeeping delete mode 100644 changes/323.housekeeping diff --git a/changes/321.housekeeping b/changes/321.housekeeping deleted file mode 100644 index 044f8618..00000000 --- a/changes/321.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Fixed CI release workflow. diff --git a/changes/323.housekeeping b/changes/323.housekeeping deleted file mode 100644 index 6a862e0f..00000000 --- a/changes/323.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Reverted PyPI publishing method. 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"