From 4bf423549d9abc41d168aa059f135935fcd8c995 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Tue, 2 Apr 2024 15:19:21 +0530 Subject: [PATCH 1/4] pass test pypi url as extra index --- .github/workflows/cd-post-release-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index 5b3640469bc..63f7fd38e5f 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -174,7 +174,7 @@ jobs: pip install syft==${{inputs.syft_version}} fi if [[ ${{ inputs.release_platform }} == "TEST_PYPI" ]]; then - pip install -i https://test.pypi.org/simple/ syft==${{inputs.syft_version}} + pip install --extra-index-url https://test.pypi.org/simple/ syft==${{inputs.syft_version}} fi - name: Check Syft version @@ -283,7 +283,7 @@ jobs: SYFT_VERSION: ${{ inputs.syft_version }} run: | if [[ ${{ inputs.release_platform }} == "TEST_PYPI" ]]; then - pip install -i https://test.pypi.org/simple/ syft[data_science,dev]==${{ inputs.syft_version }} + pip install --extra-index-url https://test.pypi.org/simple/ syft[data_science,dev]==${{ inputs.syft_version }} fi if [[ ${{ inputs.release_platform }} == "REAL_PYPI" ]]; then pip install syft[data_science,dev]==${{ inputs.syft_version }} From 4784d3741e59c381e87ba82f8a8aaa18cca92846 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Tue, 2 Apr 2024 17:01:35 +0530 Subject: [PATCH 2/4] specify shell for syft install checks workflow --- .github/workflows/cd-post-release-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml index 63f7fd38e5f..34f34baaf2f 100644 --- a/.github/workflows/cd-post-release-tests.yml +++ b/.github/workflows/cd-post-release-tests.yml @@ -169,6 +169,7 @@ jobs: ${{ runner.os }}-pip-py${{ matrix.python-version }}- - name: Install Syft + shell: bash run: | if [[ ${{inputs.release_platform}} == "REAL_PYPI" ]]; then pip install syft==${{inputs.syft_version}} From 176fa7c01c3bbd16ce4d52af941d615b6a91b704 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Tue, 2 Apr 2024 18:03:27 +0530 Subject: [PATCH 3/4] rename dataset in multiple code requests - add a sleep post creating queue stash --- notebooks/api/0.8/06-multiple-code-requests.ipynb | 4 ++-- packages/syft/tests/syft/stores/queue_stash_test.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/notebooks/api/0.8/06-multiple-code-requests.ipynb b/notebooks/api/0.8/06-multiple-code-requests.ipynb index 8f5ea606dac..9b5ad9eeb2c 100644 --- a/notebooks/api/0.8/06-multiple-code-requests.ipynb +++ b/notebooks/api/0.8/06-multiple-code-requests.ipynb @@ -93,7 +93,7 @@ "metadata": {}, "outputs": [], "source": [ - "dataset2 = sy.Dataset(name=\"My Sample Dataset - II\")\n", + "dataset2 = sy.Dataset(name=\"Age Dataset\")\n", "asset2 = sy.Asset(name=\"Sample Data - II\")\n", "asset2.set_obj(sample_data * 10)\n", "asset2.set_mock(mock_sample_data * 10, mock_is_real=False)\n", @@ -477,7 +477,7 @@ "metadata": {}, "outputs": [], "source": [ - "datasets = ds_client.datasets.search(name=\"My Sample Dataset - II\")\n", + "datasets = ds_client.datasets.search(name=\"Age Dataset\")\n", "dataset_ptr2 = datasets[0]\n", "dataset_ptr2" ] diff --git a/packages/syft/tests/syft/stores/queue_stash_test.py b/packages/syft/tests/syft/stores/queue_stash_test.py index 97efd3df41b..d1fdfa4a10b 100644 --- a/packages/syft/tests/syft/stores/queue_stash_test.py +++ b/packages/syft/tests/syft/stores/queue_stash_test.py @@ -1,5 +1,6 @@ # stdlib from threading import Thread +import time from typing import Any # third party @@ -377,6 +378,7 @@ def helper_queue_update_threading(root_verify_key, create_queue_cbk) -> None: repeats = 5 queue = create_queue_cbk() + time.sleep(1) obj = mock_queue_object() queue.set(root_verify_key, obj, ignore_duplicates=False) From 9168a863061c50ab94b2fb5c7203476b4480912b Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Tue, 2 Apr 2024 20:29:41 +0530 Subject: [PATCH 4/4] api/0.8: fix assert in multiple code requests notebook --- notebooks/api/0.8/06-multiple-code-requests.ipynb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/notebooks/api/0.8/06-multiple-code-requests.ipynb b/notebooks/api/0.8/06-multiple-code-requests.ipynb index 9b5ad9eeb2c..6e19bc6731c 100644 --- a/notebooks/api/0.8/06-multiple-code-requests.ipynb +++ b/notebooks/api/0.8/06-multiple-code-requests.ipynb @@ -174,7 +174,7 @@ "metadata": {}, "outputs": [], "source": [ - "assert len(datasets) == 2\n", + "assert len(datasets) == 1\n", "dataset_ptr = datasets[0]\n", "dataset_ptr" ] @@ -552,6 +552,14 @@ "if node.deployment_type.value in [\"python\", \"single_container\"]:\n", " node.land()" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "40", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": {