From cb8127b620d5faa741c3ef22447d6adc2b77a5d4 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:22:19 +0530 Subject: [PATCH 1/5] update readme with syftbox linking to pypi --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f891b9c4..026828aa 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ curl -LsSf https://astral.sh/uv/install.sh | sh uv venv .venv -## install the wheel +## Install Syftbox -uv pip install http://20.168.10.234:8080/wheel/syftbox-0.1.0-py3-none-any.whl --reinstall +uv pip install -U syftbox ## run the client From 450f193797e4a7e455020b1bcff288828360b435 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:31:30 +0530 Subject: [PATCH 2/5] make git push to the checked-out branch --- .github/workflows/cd-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml index 3d6b028d..8af8d608 100644 --- a/.github/workflows/cd-release.yaml +++ b/.github/workflows/cd-release.yaml @@ -70,4 +70,4 @@ jobs: - name: Push changes to SyftBox repo if: ${{ inputs.test_bump == false }} run: | - git push origin main + git push origin From 444ddcff4e6a0bd2d948cfcb9e7bc6d518cb02ea Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:47:00 +0530 Subject: [PATCH 3/5] add pre-release tests as pre-cursor to the release --- .github/workflows/cd-release.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml index 8af8d608..3c83cae9 100644 --- a/.github/workflows/cd-release.yaml +++ b/.github/workflows/cd-release.yaml @@ -16,6 +16,15 @@ on: description: "Perform a test bump version without pushing to pypi and repo" type: boolean default: false + + skip_tests: + description: "If true, skip pre-release tests" + required: false + default: "false" + type: choice + options: + - "false" + - "true" # Prevents concurrent runs of the same workflow # while the previous run is still in progress @@ -24,7 +33,13 @@ concurrency: cancel-in-progress: false jobs: + call-pr-tests: + if: ${{ inputs.skip_tests == 'false' }} + uses: ./.github/workflows/pr-tests.yaml + + deploy-syftbox: + needs: [call-pr-tests] runs-on: ubuntu-latest steps: From 62b0186fae6ff1df0142bd1b66be1d889539715c Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:57:21 +0530 Subject: [PATCH 4/5] update server instructions --- syftbox/server/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syftbox/server/server.py b/syftbox/server/server.py index 604512f5..4ebc12fc 100644 --- a/syftbox/server/server.py +++ b/syftbox/server/server.py @@ -180,7 +180,7 @@ async def lifespan(app: FastAPI): uv venv .venv # install the wheel -uv pip install http://20.168.10.234:8080/wheel/syftbox-0.1.0-py3-none-any.whl --reinstall +uv pip install -U syftbox # run the client uv run syftbox client From 18b997045a2522d2bf2c9a0f4b6f1b17a947622a Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:00:51 +0530 Subject: [PATCH 5/5] typos --- syftbox/server/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syftbox/server/server.py b/syftbox/server/server.py index 4ebc12fc..055e2005 100644 --- a/syftbox/server/server.py +++ b/syftbox/server/server.py @@ -179,7 +179,7 @@ async def lifespan(app: FastAPI): # create a virtualenv somewhere uv venv .venv -# install the wheel +# Install SyftBox uv pip install -U syftbox # run the client