From d5b44b10fd735a6a725b766cb56c36b519ba8293 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Wed, 18 Jan 2023 11:03:26 +0530 Subject: [PATCH 01/23] add new tests for R3Q1 --- packages/syft/tests/trials/skill_test.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 0b94aec1703..1ca7669638e 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -27,7 +27,8 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Akshay": "PASSED", "Zarreen": "PASSED", "Mihir": "PASSED", - } + }, + "R3Q1": {"skywalker": "FAILED"}, } return data[cohort] @@ -54,4 +55,7 @@ def test_trial_of_skill() -> None: assert get_padawans("R2Q4")["Zarreen"] == "PASSED" assert get_padawans("R2Q4")["Mihir"] == "PASSED" - assert len(get_padawans("R2Q4")) > 1 + assert len(get_padawans("R2Q4")) == 20 + + assert get_padawans("R3Q1")["skywalker"] == "PASSED" + assert len(get_padawans("R3Q1")) > 1 From 7a845311e0ebccd1c200fab789f7a4ea5bad4aaf Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Mon, 23 Jan 2023 09:36:58 +1000 Subject: [PATCH 02/23] Try upgrading tox --- .github/workflows/benchmark.yml | 2 +- .github/workflows/continuous-delivery.yml | 2 +- .github/workflows/doc.yml | 2 +- .github/workflows/grid-backend_tests.yml | 2 +- .github/workflows/grid-frontend_tests.yml | 2 +- .github/workflows/hagrid-continuous_delivery.yml | 2 +- .github/workflows/hagrid-pr_tests.yml | 2 +- .github/workflows/nightlies-run.yml | 2 +- .github/workflows/stack-integration-arm64_tests.yml | 4 ++-- .github/workflows/stack-integration-public_tests.yml | 2 +- .github/workflows/stack-integration_tests.yml | 12 ++++++------ .github/workflows/syft-publish.yml | 2 +- packages/grid/ansible/roles/jupyter/tasks/main.yml | 2 +- tox.ini | 4 ---- 14 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 8175da4c858..36426be1964 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -37,7 +37,7 @@ jobs: - name: Install tox run: | - pip install tox==3.27.1 + pip install -U tox - name: Install mongo tools run: | diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml index 22b5faffab7..f2d6ca09364 100644 --- a/.github/workflows/continuous-delivery.yml +++ b/.github/workflows/continuous-delivery.yml @@ -63,7 +63,7 @@ jobs: run: | python -m pip install --upgrade pip pip install --upgrade setuptools wheel twine bump2version PyYAML - pip install tox==3.27.1 + pip install -U tox - name: Bump the Version run: | ls **/VERSION | xargs -I {} python {} diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 0ae4c1136ad..771b22c674f 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -27,7 +27,7 @@ jobs: - name: Install tox run: | - pip install tox==3.27.1 + pip install -U tox - name: Build the docs run: | diff --git a/.github/workflows/grid-backend_tests.yml b/.github/workflows/grid-backend_tests.yml index 1eb0c2ed5da..e7be22af602 100644 --- a/.github/workflows/grid-backend_tests.yml +++ b/.github/workflows/grid-backend_tests.yml @@ -66,7 +66,7 @@ jobs: - name: Install tox if: steps.changes.outputs.backend == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Run Backend API tests shell: bash diff --git a/.github/workflows/grid-frontend_tests.yml b/.github/workflows/grid-frontend_tests.yml index 7b86c86e046..d4c860e3b5d 100644 --- a/.github/workflows/grid-frontend_tests.yml +++ b/.github/workflows/grid-frontend_tests.yml @@ -62,7 +62,7 @@ jobs: - name: Install tox if: steps.changes.outputs.frontend == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Cache Cypress binary if: steps.changes.outputs.frontend == 'true' diff --git a/.github/workflows/hagrid-continuous_delivery.yml b/.github/workflows/hagrid-continuous_delivery.yml index af6ae92477f..07ac5d6bac3 100644 --- a/.github/workflows/hagrid-continuous_delivery.yml +++ b/.github/workflows/hagrid-continuous_delivery.yml @@ -45,7 +45,7 @@ jobs: run: | python -m pip install --upgrade pip pip install --upgrade setuptools wheel twine bump2version PyYAML - pip install tox==3.27.1 + pip install -U tox - name: Bump the Version if: ${{needs.hagrid-deploy.outputs.current_hash}} != ${{needs.hagrid-deploy.outputs.previous_hash}} diff --git a/.github/workflows/hagrid-pr_tests.yml b/.github/workflows/hagrid-pr_tests.yml index 2e7aea15caa..e0e43957429 100644 --- a/.github/workflows/hagrid-pr_tests.yml +++ b/.github/workflows/hagrid-pr_tests.yml @@ -66,7 +66,7 @@ jobs: if: steps.changes.outputs.hagrid == 'true' run: | pip install --upgrade bandit safety setuptools wheel twine - pip install tox==3.27.1 + pip install -U tox pip install -e . - name: Scan for security issues python 3.8+ diff --git a/.github/workflows/nightlies-run.yml b/.github/workflows/nightlies-run.yml index 8ca7c380deb..dce98e6c715 100644 --- a/.github/workflows/nightlies-run.yml +++ b/.github/workflows/nightlies-run.yml @@ -104,7 +104,7 @@ jobs: - name: Install tox run: | - pip install tox==3.27.1 + pip install -U tox - name: Install Docker Compose if: runner.os == 'Linux' diff --git a/.github/workflows/stack-integration-arm64_tests.yml b/.github/workflows/stack-integration-arm64_tests.yml index 01cb604d918..526eb14e83e 100644 --- a/.github/workflows/stack-integration-arm64_tests.yml +++ b/.github/workflows/stack-integration-arm64_tests.yml @@ -59,7 +59,7 @@ jobs: - name: Install tox run: | - pip install tox==3.27.1 + pip install -U tox - name: Install Docker Compose if: runner.os == 'Linux' @@ -134,7 +134,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Show choco installed packages if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows' diff --git a/.github/workflows/stack-integration-public_tests.yml b/.github/workflows/stack-integration-public_tests.yml index aafde3f94ee..0ab6916270f 100644 --- a/.github/workflows/stack-integration-public_tests.yml +++ b/.github/workflows/stack-integration-public_tests.yml @@ -47,7 +47,7 @@ jobs: - name: Install tox run: | - pip install tox==3.27.1 + pip install -U tox - name: Install Docker Compose if: runner.os == 'Linux' diff --git a/.github/workflows/stack-integration_tests.yml b/.github/workflows/stack-integration_tests.yml index 917983fecf0..4a183e6dcf9 100644 --- a/.github/workflows/stack-integration_tests.yml +++ b/.github/workflows/stack-integration_tests.yml @@ -72,7 +72,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Show choco installed packages if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows' @@ -237,7 +237,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Show choco installed packages if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows' @@ -411,7 +411,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Show choco installed packages if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows' @@ -586,7 +586,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Show choco installed packages if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows' @@ -754,7 +754,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: Install kubectl if: steps.changes.outputs.stack == 'true' @@ -918,7 +918,7 @@ jobs: - name: Install tox if: steps.changes.outputs.stack == 'true' run: | - pip install tox==3.27.1 + pip install -U tox - name: docker cache uses: actions/cache@v3 diff --git a/.github/workflows/syft-publish.yml b/.github/workflows/syft-publish.yml index 8b7d5eb7609..41cfad1a3e7 100644 --- a/.github/workflows/syft-publish.yml +++ b/.github/workflows/syft-publish.yml @@ -19,7 +19,7 @@ jobs: run: | python -m pip install --upgrade pip pip install --upgrade setuptools wheel twine bump2version - pip install tox==3.27.1 + pip install -U tox - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} diff --git a/packages/grid/ansible/roles/jupyter/tasks/main.yml b/packages/grid/ansible/roles/jupyter/tasks/main.yml index a294b12995d..929f975b678 100644 --- a/packages/grid/ansible/roles/jupyter/tasks/main.yml +++ b/packages/grid/ansible/roles/jupyter/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install Tox - shell: "runuser -l {{ om_user }} -c 'pip install tox==3.27.1'" + shell: "runuser -l {{ om_user }} -c 'pip install -U tox'" become: yes when: vagrant is not defined and jupyter == "true" diff --git a/tox.ini b/tox.ini index e409d29be79..0488d7833ae 100644 --- a/tox.ini +++ b/tox.ini @@ -18,10 +18,6 @@ envlist = syft.test.fast.coverage syft.test.security padawan.trials -requires = - tox-run-command - pip >= 22.0.4 - tox==3.27.1 skipsdist = True From ee21631efc4de1b4a1ca7291cf67f1d83413236e Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Mon, 23 Jan 2023 10:03:25 +1000 Subject: [PATCH 03/23] Added chcp to allowlist_externals in tox --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index 0488d7833ae..bf60ab412bd 100644 --- a/tox.ini +++ b/tox.ini @@ -180,6 +180,7 @@ allowlist_externals = grep sleep bash + chcp setenv = PIP_FIND_LINKS=https://whls.blob.core.windows.net/unstable/index.html HAGRID_FLAGS = {env:HAGRID_FLAGS:--tag=local --test} @@ -298,6 +299,7 @@ allowlist_externals = bash mkcert mkdir + chcp setenv = PIP_FIND_LINKS=https://whls.blob.core.windows.net/unstable/index.html HAGRID_FLAGS = {env:HAGRID_FLAGS:--tag=local --test} @@ -420,6 +422,7 @@ allowlist_externals = grep sleep bash + chcp setenv = PIP_FIND_LINKS=https://whls.blob.core.windows.net/unstable/index.html HAGRID_FLAGS = {env:HAGRID_FLAGS:--tag=local --test} @@ -524,6 +527,7 @@ allowlist_externals = grep sleep bash + chcp setenv = PIP_FIND_LINKS=https://whls.blob.core.windows.net/unstable/index.html HAGRID_FLAGS = {env:HAGRID_FLAGS:--tag=local --test} From f27561b1be6622992e14b991af7d6399965062a5 Mon Sep 17 00:00:00 2001 From: Zach Zaiman Date: Tue, 24 Jan 2023 18:41:08 -0500 Subject: [PATCH 04/23] padawan trial 1 --- packages/syft/tests/trials/skill_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 1ca7669638e..918da3c457a 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -28,7 +28,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zarreen": "PASSED", "Mihir": "PASSED", }, - "R3Q1": {"skywalker": "FAILED"}, + "R3Q1": {"skywalker": "FAILED", "Zach": "PASSED"}, } return data[cohort] @@ -58,4 +58,5 @@ def test_trial_of_skill() -> None: assert len(get_padawans("R2Q4")) == 20 assert get_padawans("R3Q1")["skywalker"] == "PASSED" + assert get_padawans("R3Q1")["Zach"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From 13297651e80a49015fab7d3fb237ea42e152e22f Mon Sep 17 00:00:00 2001 From: khoaguin Date: Wed, 25 Jan 2023 20:48:19 +0700 Subject: [PATCH 05/23] Padawan trial 1: Added my name to skill_test.py --- packages/syft/tests/trials/skill_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 1ca7669638e..7142a7d46f7 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -28,7 +28,10 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zarreen": "PASSED", "Mihir": "PASSED", }, - "R3Q1": {"skywalker": "FAILED"}, + "R3Q1": { + "skywalker": "FAILED", + "Khoa": "PASSED", + }, } return data[cohort] From 0bd3205e1ed620600f24d0db7f32296c4f9b4f5b Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 26 Jan 2023 06:13:44 +1000 Subject: [PATCH 06/23] Trigger CI --- .github/workflows/syft-pr_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml index 18806e7c93f..eb114ad84b5 100644 --- a/.github/workflows/syft-pr_tests.yml +++ b/.github/workflows/syft-pr_tests.yml @@ -16,6 +16,7 @@ on: - "0.6.0" - "0.7.0" - "0.8" + - "padawan_trial_1" defaults: run: working-directory: ./packages/syft From d2aa48994155c17df222f972c5e6c83480071c03 Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 26 Jan 2023 06:19:40 +1000 Subject: [PATCH 07/23] Ignoring GitHub CI Setuptools version check --- .github/workflows/syft-pr_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml index eb114ad84b5..6d466016f95 100644 --- a/.github/workflows/syft-pr_tests.yml +++ b/.github/workflows/syft-pr_tests.yml @@ -85,7 +85,7 @@ jobs: run: | pip install importlib-metadata==4.13.0 bandit -r src - safety check -i 51668 + safety check -i 51668 -i 52495 - name: Scan for security issues python 3.7 if: steps.changes.outputs.syft == 'true' && matrix.python-version == '3.7' @@ -93,7 +93,7 @@ jobs: pip install importlib-metadata==4.13.0 bandit -r src # we want to test python 3.7 for colab so we have to ignore these numpy issues - safety check -i 44717 -i 44716 -i 44715 -i 51668 + safety check -i 44717 -i 44716 -i 44715 -i 51668 -i 52495 - name: Run normal tests if: steps.changes.outputs.syft == 'true' From f391d40e4a0a0fccd7f56a9a1103b8c7c2925e40 Mon Sep 17 00:00:00 2001 From: Zach Zaiman Date: Wed, 25 Jan 2023 15:25:59 -0500 Subject: [PATCH 08/23] modified skywalker passing status --- packages/syft/tests/trials/skill_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 918da3c457a..abcc57be1dc 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -28,7 +28,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zarreen": "PASSED", "Mihir": "PASSED", }, - "R3Q1": {"skywalker": "FAILED", "Zach": "PASSED"}, + "R3Q1": {"skywalker": "PASSED", "Zach": "PASSED"}, } return data[cohort] From 5b0d8d220727bc21e6a4fb2851601a706bdf5d14 Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 26 Jan 2023 06:13:44 +1000 Subject: [PATCH 09/23] Trigger CI --- .github/workflows/syft-pr_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml index 18806e7c93f..eb114ad84b5 100644 --- a/.github/workflows/syft-pr_tests.yml +++ b/.github/workflows/syft-pr_tests.yml @@ -16,6 +16,7 @@ on: - "0.6.0" - "0.7.0" - "0.8" + - "padawan_trial_1" defaults: run: working-directory: ./packages/syft From 2db680310f3d9f432124126a65a346491e434c59 Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 26 Jan 2023 06:19:40 +1000 Subject: [PATCH 10/23] Ignoring GitHub CI Setuptools version check --- .github/workflows/syft-pr_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml index eb114ad84b5..6d466016f95 100644 --- a/.github/workflows/syft-pr_tests.yml +++ b/.github/workflows/syft-pr_tests.yml @@ -85,7 +85,7 @@ jobs: run: | pip install importlib-metadata==4.13.0 bandit -r src - safety check -i 51668 + safety check -i 51668 -i 52495 - name: Scan for security issues python 3.7 if: steps.changes.outputs.syft == 'true' && matrix.python-version == '3.7' @@ -93,7 +93,7 @@ jobs: pip install importlib-metadata==4.13.0 bandit -r src # we want to test python 3.7 for colab so we have to ignore these numpy issues - safety check -i 44717 -i 44716 -i 44715 -i 51668 + safety check -i 44717 -i 44716 -i 44715 -i 51668 -i 52495 - name: Run normal tests if: steps.changes.outputs.syft == 'true' From 223fb1ec5b48dca3c2828490dcbe8910632e9bd8 Mon Sep 17 00:00:00 2001 From: khoaguin Date: Thu, 26 Jan 2023 11:01:38 +0700 Subject: [PATCH 11/23] merge with padawa_trial_1 and change skywalker to PASSED --- packages/syft/tests/trials/skill_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 1faa90c7ab3..6e07f967385 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -29,7 +29,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Mihir": "PASSED", }, "R3Q1": { - "skywalker": "FAILED", + "skywalker": "PASSED", "Zach": "PASSED", "Khoa": "PASSED", }, From abe0feefb56163ee3e463185d0565ba08d11bd37 Mon Sep 17 00:00:00 2001 From: Oleksandr Lytvyn Date: Thu, 26 Jan 2023 21:41:54 +0100 Subject: [PATCH 12/23] First commit in padawan programm. Added Name to SkillTest --- packages/syft/tests/trials/skill_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index abcc57be1dc..18f89d3190c 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -28,7 +28,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zarreen": "PASSED", "Mihir": "PASSED", }, - "R3Q1": {"skywalker": "PASSED", "Zach": "PASSED"}, + "R3Q1": {"skywalker": "PASSED", "Zach": "PASSED", "Oleksandr": "PASSED"}, } return data[cohort] @@ -59,4 +59,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["skywalker"] == "PASSED" assert get_padawans("R3Q1")["Zach"] == "PASSED" + assert get_padawans("R3Q1")["Oleksandr"] == "PASSED" + assert len(get_padawans("R3Q1")) > 1 From d09b3ae65820780ee4b4be47c7502e922f6b7e40 Mon Sep 17 00:00:00 2001 From: khoaguin Date: Fri, 27 Jan 2023 09:43:21 +0700 Subject: [PATCH 13/23] added my name to the 'R3Q1' dict in get_padawans function and an assert in the 'test_trial_of_skill' function --- packages/syft/tests/trials/skill_test.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 18f89d3190c..a9c04db1f19 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -28,7 +28,12 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zarreen": "PASSED", "Mihir": "PASSED", }, - "R3Q1": {"skywalker": "PASSED", "Zach": "PASSED", "Oleksandr": "PASSED"}, + "R3Q1": { + "skywalker": "PASSED", + "Zach": "PASSED", + "Oleksandr": "PASSED", + "Khoa": "PASSED", + }, } return data[cohort] @@ -60,5 +65,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["skywalker"] == "PASSED" assert get_padawans("R3Q1")["Zach"] == "PASSED" assert get_padawans("R3Q1")["Oleksandr"] == "PASSED" + assert get_padawans("R3Q1")["Khoa"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From 1cc670513d7bd72e04d87a556a7b11afd63c06ee Mon Sep 17 00:00:00 2001 From: Ajinkya K Mulay Date: Fri, 27 Jan 2023 18:54:47 +0530 Subject: [PATCH 14/23] Add name to skill_test --- packages/syft/tests/trials/skill_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index a9c04db1f19..b455a83310f 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -33,6 +33,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zach": "PASSED", "Oleksandr": "PASSED", "Khoa": "PASSED", + "Ajinkya": "PASSED", }, } return data[cohort] @@ -66,5 +67,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Zach"] == "PASSED" assert get_padawans("R3Q1")["Oleksandr"] == "PASSED" assert get_padawans("R3Q1")["Khoa"] == "PASSED" + assert get_padawans("R3Q1")["Ajinkya"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From ef406a2075df86bae2f44cc683d22e5e06988423 Mon Sep 17 00:00:00 2001 From: Julian Cardonnet Date: Fri, 27 Jan 2023 10:53:44 -0300 Subject: [PATCH 15/23] Add my name to Padawans dict --- packages/syft/tests/trials/skill_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index a9c04db1f19..59cb630b54f 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -33,6 +33,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Zach": "PASSED", "Oleksandr": "PASSED", "Khoa": "PASSED", + "Julian": "PASSED", }, } return data[cohort] @@ -66,5 +67,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Zach"] == "PASSED" assert get_padawans("R3Q1")["Oleksandr"] == "PASSED" assert get_padawans("R3Q1")["Khoa"] == "PASSED" + assert get_padawans("R3Q1")["Julian"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From 5b05025dfb46ea6fb659487a4f534586c3dfdf5c Mon Sep 17 00:00:00 2001 From: Hussein Lezzaik Date: Sat, 28 Jan 2023 23:27:44 -0500 Subject: [PATCH 16/23] [NEW] Add my name in R3Q1 skill_test.py --- packages/syft/tests/trials/skill_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index b455a83310f..07e85d9b741 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -34,6 +34,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Oleksandr": "PASSED", "Khoa": "PASSED", "Ajinkya": "PASSED", + "Hussein": "PASSED", }, } return data[cohort] @@ -68,5 +69,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Oleksandr"] == "PASSED" assert get_padawans("R3Q1")["Khoa"] == "PASSED" assert get_padawans("R3Q1")["Ajinkya"] == "PASSED" + assert get_padawans("R3Q1")["Hussein"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From 6fc0b253b068ca7dd4741fef1f5ae5dc5484ca75 Mon Sep 17 00:00:00 2001 From: onlyoneuche Date: Sun, 29 Jan 2023 20:29:53 +0100 Subject: [PATCH 17/23] Added my name to padawans data in skill_test.py, bumped isort version to 5.12.0 because of dependency errors --- .pre-commit-config.yaml | 2 +- packages/syft/tests/trials/skill_test.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f37363136db..50a8f4b55de 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -55,7 +55,7 @@ repos: )$ - repo: https://github.com/pycqa/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort name: isort diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index b455a83310f..7ff619452dc 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -27,6 +27,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Akshay": "PASSED", "Zarreen": "PASSED", "Mihir": "PASSED", + "Uche": "PASSED", }, "R3Q1": { "skywalker": "PASSED", @@ -60,8 +61,9 @@ def test_trial_of_skill() -> None: assert get_padawans("R2Q4")["Akshay"] == "PASSED" assert get_padawans("R2Q4")["Zarreen"] == "PASSED" assert get_padawans("R2Q4")["Mihir"] == "PASSED" + assert get_padawans("R2Q4")["Uche"] == "PASSED" - assert len(get_padawans("R2Q4")) == 20 + assert len(get_padawans("R2Q4")) == 21 assert get_padawans("R3Q1")["skywalker"] == "PASSED" assert get_padawans("R3Q1")["Zach"] == "PASSED" From 2f1f7ac24b01068cd1b4e7c9c264ee626ffa9280 Mon Sep 17 00:00:00 2001 From: Skylarkin <96817160+Skylarkin@users.noreply.github.com> Date: Mon, 30 Jan 2023 22:08:13 +1100 Subject: [PATCH 18/23] peter chung: added name to padawan_trial_1 --- packages/syft/tests/trials/skill_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index b455a83310f..c3478e8b3a9 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -34,6 +34,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Oleksandr": "PASSED", "Khoa": "PASSED", "Ajinkya": "PASSED", + "Peter": "PASSED", }, } return data[cohort] @@ -68,5 +69,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Oleksandr"] == "PASSED" assert get_padawans("R3Q1")["Khoa"] == "PASSED" assert get_padawans("R3Q1")["Ajinkya"] == "PASSED" + assert get_padawans("R3Q1")["Peter"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From cbb193ac17134773f9b7c49408c3706a9f4e7a1b Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Tue, 31 Jan 2023 08:56:35 +1000 Subject: [PATCH 19/23] Fixed formatting of skill_test.py file - Removed some unused steps in the tox lint task to speed things up --- packages/syft/tests/trials/skill_test.py | 3 +-- tox.ini | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index a6cf8ab2777..502549711bc 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -34,7 +34,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Oleksandr": "PASSED", "Khoa": "PASSED", "Ajinkya": "PASSED", - "Hussein": "PASSED", + "Hussein": "PASSED", "Peter": "PASSED", }, } @@ -73,5 +73,4 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Hussein"] == "PASSED" assert get_padawans("R3Q1")["Peter"] == "PASSED" - assert len(get_padawans("R3Q1")) > 1 diff --git a/tox.ini b/tox.ini index bf60ab412bd..f8ae06033ad 100644 --- a/tox.ini +++ b/tox.ini @@ -37,13 +37,8 @@ allowlist_externals = deps = black[python2] isort - protoc-wheel-0==3.19.4 pre-commit commands = - pip install protoc-wheel-0==3.19.4 --force - bash -c "cd {toxinidir}/packages/syft; ./scripts/build_proto.sh" - black . - isort . pre-commit run --all-files [testenv:padawan.trials] From 4d16c1618814030c956fb1eca9beeb078125fa4e Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Tue, 31 Jan 2023 09:04:04 +1000 Subject: [PATCH 20/23] Upgrade isort pre-commit plugin due to error --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f37363136db..50a8f4b55de 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -55,7 +55,7 @@ repos: )$ - repo: https://github.com/pycqa/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort name: isort From c18df3d8a1334c3276336bb8236855955b88c9a2 Mon Sep 17 00:00:00 2001 From: Vani Singh Date: Mon, 30 Jan 2023 09:52:17 +0530 Subject: [PATCH 21/23] add padawan vani's skill test --- packages/syft/tests/trials/skill_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 0cc361cf6e8..e1ed32d032b 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -38,6 +38,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Ajinkya": "PASSED", "Hussein": "PASSED", "Peter": "PASSED", + "Vani": "PASSED", }, } return data[cohort] @@ -77,5 +78,6 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Hussein"] == "PASSED" assert get_padawans("R3Q1")["Peter"] == "PASSED" + assert get_padawans("R3Q1")["Vani"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From c53e1cebddc13abe65370bf89bf707f384cae674 Mon Sep 17 00:00:00 2001 From: HaithemLamri Date: Tue, 31 Jan 2023 17:34:13 +0100 Subject: [PATCH 22/23] added Hithem to skill_test --- packages/syft/tests/trials/skill_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index e1ed32d032b..6dc694838da 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -39,6 +39,7 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Hussein": "PASSED", "Peter": "PASSED", "Vani": "PASSED", + "Hithem": "PASSED", }, } return data[cohort] @@ -77,7 +78,7 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Ajinkya"] == "PASSED" assert get_padawans("R3Q1")["Hussein"] == "PASSED" assert get_padawans("R3Q1")["Peter"] == "PASSED" - assert get_padawans("R3Q1")["Vani"] == "PASSED" + assert get_padawans("R3Q1")["Hithem"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 From d093c79de2bd4b22ea510a270aa6d3148160eb3a Mon Sep 17 00:00:00 2001 From: Antti Kalliokoski Date: Thu, 27 Apr 2023 10:05:20 +0300 Subject: [PATCH 23/23] Add antti to the list of padawans. - Initialize skill test list for R4Q2 - Add antti to the list of padawans --- packages/syft/tests/trials/skill_test.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/syft/tests/trials/skill_test.py b/packages/syft/tests/trials/skill_test.py index 6dc694838da..547e45fb794 100644 --- a/packages/syft/tests/trials/skill_test.py +++ b/packages/syft/tests/trials/skill_test.py @@ -41,6 +41,10 @@ def get_padawans(cohort: str) -> Dict[str, str]: "Vani": "PASSED", "Hithem": "PASSED", }, + "R4Q2": { + "skywalker": "PASSED", + "antti": "PASSED", + }, } return data[cohort] @@ -82,3 +86,8 @@ def test_trial_of_skill() -> None: assert get_padawans("R3Q1")["Hithem"] == "PASSED" assert len(get_padawans("R3Q1")) > 1 + + assert get_padawans("R4Q2")["skywalker"] == "PASSED" + assert get_padawans("R4Q2")["antti"] == "PASSED" + + assert len(get_padawans("R4Q2")) > 1