Add antti to the list of padawans.

.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: |

.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 {}

.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: |

.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

.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'

.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}}

.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+

.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'

.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'

.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'

.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

.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
@@ -84,15 +85,15 @@ 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'
  run: |
  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'

.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 }}

.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

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"
 

packages/syft/tests/trials/skill_test.py

@@ -27,7 +27,24 @@ def get_padawans(cohort: str) -> Dict[str, str]:
  "Akshay": "PASSED",
  "Zarreen": "PASSED",
  "Mihir": "PASSED",
- }
+ "Uche": "PASSED",
+ },
+ "R3Q1": {
+ "skywalker": "PASSED",
+ "Zach": "PASSED",
+ "Oleksandr": "PASSED",
+ "Khoa": "PASSED",
+ "Julian": "PASSED",
+ "Ajinkya": "PASSED",
+ "Hussein": "PASSED",
+ "Peter": "PASSED",
+ "Vani": "PASSED",
+ "Hithem": "PASSED",
+ },
+ "R4Q2": {
+ "skywalker": "PASSED",
+ "antti": "PASSED",
+ },
  }
  return data[cohort]
 
@@ -53,5 +70,24 @@ 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")) == 21
+
+ 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 get_padawans("R3Q1")["Julian"] == "PASSED"
+ 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
+
+ assert get_padawans("R4Q2")["skywalker"] == "PASSED"
+ assert get_padawans("R4Q2")["antti"] == "PASSED"
 
- assert len(get_padawans("R2Q4")) > 1
+ assert len(get_padawans("R4Q2")) > 1

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
 
 
@@ -41,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]
@@ -184,6 +175,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}
@@ -302,6 +294,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}
@@ -424,6 +417,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}
@@ -528,6 +522,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}