Merge branch 'dev' into yash/helm-upgrade

OpenMined · Mar 1, 2024 · 2f9112e · 2f9112e
2 parents d98b730 + 03e0e7b
commit 2f9112e
Show file tree

Hide file tree

Showing 83 changed files with 1,312 additions and 1,935 deletions.
diff --git a/.github/workflows/pr-tests-stack-arm64.yml b/.github/workflows/pr-tests-stack-arm64.yml
@@ -94,7 +94,7 @@ jobs:
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
       - name: Run integration tests
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_seconds: 36000
           max_attempts: 3

diff --git a/.github/workflows/pr-tests-stack-public.yml b/.github/workflows/pr-tests-stack-public.yml
@@ -148,7 +148,7 @@ jobs:
       #     tox -e stack.test.integration
 
       - name: Run integration tests
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         if: steps.changes.outputs.stack == 'true'
         env:
           HAGRID_ART: false

diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml
@@ -174,7 +174,7 @@ jobs:
           pip install --upgrade tox packaging wheel --default-timeout=60
 
       - name: Run notebook tests
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks == 'true'
         env:
           ORCHESTRA_DEPLOYMENT_TYPE: "${{ matrix.deployment-type }}"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -172,15 +172,15 @@ repos:
       - id: mypy
         name: "mypy: syft"
         always_run: true
-        files: "^packages/syft/src/syft/serde|^packages/syft/src/syft/util/env.py|^packages/syft/src/syft/util/logger.py|^packages/syft/src/syft/util/markdown.py|^packages/syft/src/syft/util/notebook_ui/notebook_addons.py|^packages/syft/src/syft/img/base64.py|^packages/syft/src/syft/store/mongo_codecs.py|^packages/syft/src/syft/service/warnings.py|^packages/syft/src/syft/util/util.py|^packages/syft/src/syft/client/api.py|^packages/syft/src/syft/service/worker|^packages/syft/src/syft/service/user|^packages/syft/src/syft/service/dataset"
-        #files: "^packages/syft/src/syft/serde"
+        files: "^packages/syft/src/syft/serde|^packages/syft/src/syft/util|^packages/syft/src/syft/service"
+        # files: "^packages/syft/src/syft/"
         args: [
             "--follow-imports=skip",
             "--ignore-missing-imports",
             "--scripts-are-modules",
             "--disallow-incomplete-defs",
             "--no-implicit-optional",
-            "--warn-unused-ignores",
+            # "--warn-unused-ignores",
             "--warn-redundant-casts",
             "--strict-equality",
             "--warn-unreachable",

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,6 @@
 certifi>=2023.7.22 # not directly required, pinned by Snyk to avoid a vulnerability
 ipython==8.10.0
+jinja2>=3.1.3 # not directly required, pinned by Snyk to avoid a vulnerability
 markupsafe==2.0.1
 pydata-sphinx-theme==0.7.2
 pygments>=2.15.0 # not directly required, pinned by Snyk to avoid a vulnerability