From 26589d5679251c461da5cd7c27ded75739a4bab4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 28 Apr 2025 21:14:36 +0000 Subject: [PATCH 1/2] =?UTF-8?q?"Bump=20version:=200.1.5=20=E2=86=92=200.1.?= =?UTF-8?q?6=20[skip=20ci]"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/conf.py | 2 +- setup.py | 2 +- src/quads_lib/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6d82b4a..6551fd9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.5 +current_version = 0.1.6 commit = True tag = True message = "Bump version: {current_version} → {new_version} [skip ci]" diff --git a/docs/conf.py b/docs/conf.py index 6056d4e..27d65f4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,7 +15,7 @@ year = "2025" author = "Gonzalo Rafuls" copyright = f"{year}, {author}" -version = release = "0.1.5" +version = release = "0.1.6" pygments_style = "trac" templates_path = ["."] diff --git a/setup.py b/setup.py index 9518c1f..93e9bec 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name="quads-lib", - version="0.1.5", + version="0.1.6", license="LGPL-3.0-only", description="Python client library for interacting with the QUADS API", long_description="{}\n{}".format( diff --git a/src/quads_lib/__init__.py b/src/quads_lib/__init__.py index d44b01b..fb5ff1f 100644 --- a/src/quads_lib/__init__.py +++ b/src/quads_lib/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.1.5" +__version__ = "0.1.6" from .quads import QuadsApi From 7778744168f5e50e64feb1d6fbbe61212b99f60f Mon Sep 17 00:00:00 2001 From: Gonzalo Rafuls Date: Mon, 28 Apr 2025 19:11:12 -0300 Subject: [PATCH 2/2] fix: GHA branches sync --- .github/workflows/publish.yml | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1995d91..0ec54d2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,29 +41,14 @@ jobs: - name: Build package run: python setup.py sdist bdist_wheel - - name: Push changes to latest - if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }} - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: latest - - - name: Create pull request to development - id: create_pr - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - base: development - branch: latest - title: 'Sync latest with development' - body: 'This PR syncs the latest branch with development to keep versioning in parity.' - - - name: Enable auto-merge - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }} - merge-method: squash # or 'merge' or 'rebase' + - name: Sync changes with all branches + run: | + git checkout latest + git pull origin latest --rebase + git push origin latest + git checkout development + git merge latest + git push origin development - name: Publish package env: