From 0d61cc674389c5dd8979b3c86f6e0fe45d337cfc Mon Sep 17 00:00:00 2001
From: Madhava Jay <me@madhavajay.com>
Date: Thu, 16 Sep 2021 10:51:53 +1000
Subject: [PATCH] Disabling pydp due to issues on macos

- importing pydp after syft causes a core dump
  https://github.com/OpenMined/PyDP/issues/393
---
 .github/workflows/syft-pr_tests.yml                   | 2 +-
 .github/workflows/syft-version_tests.yml              | 1 +
 packages/syft/setup.cfg                               | 6 +++---
 packages/syft/tests/syft/lib/pydp/client_pydp_test.py | 8 ++++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml
index 6d9046f9293..8e2d5192cd1 100644
--- a/.github/workflows/syft-pr_tests.yml
+++ b/.github/workflows/syft-pr_tests.yml
@@ -75,7 +75,7 @@ jobs:
         if: startsWith(runner.os, 'macos')
         run: |
           brew install libomp
-          curl -sSf https://lets.tunshell.com/init.sh | sh -s -- T X6ay56qPbv7b53K6XrlTsn HwYnh3IWYbHX64GqE1ctin au.relay.tunshell.com
+          pip uninstall python-dp -y
 
       - name: Run normal tests
         run: |
diff --git a/.github/workflows/syft-version_tests.yml b/.github/workflows/syft-version_tests.yml
index c85ea363272..8172459876d 100644
--- a/.github/workflows/syft-version_tests.yml
+++ b/.github/workflows/syft-version_tests.yml
@@ -93,6 +93,7 @@ jobs:
         if: startsWith(runner.os, 'macos')
         run: |
           brew install libomp
+          pip uninstall python-dp -y
 
       - name: Run supported library tests
         run: |
diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg
index 2f8bb4c306a..4c49c11ff90 100644
--- a/packages/syft/setup.cfg
+++ b/packages/syft/setup.cfg
@@ -101,7 +101,7 @@ libs =
     pandas
     petlib
     pillow>=8.3.1 # security-issues
-    python-dp
+    # python-dp
     statsmodels
     tenseal
     xgboost>=1.4
@@ -161,7 +161,7 @@ ci-libs =
 ;    petlib #install-custom-dependency
 ;    pillow>=8.1.2,<=8.2.0 #install-custom-dependency
 ;    pyarrow #install-custom-dependency
-;    python-dp #install-custom-dependency
+# ;    python-dp #install-custom-dependency
 ;    statsmodels #install-custom-dependency
 ;    tenseal #install-custom-dependency
 ;    xgboost>=1.4 #install-custom-dependency
@@ -178,7 +178,7 @@ ci-grid =
     flask_sqlalchemy
     names
     PyInquirer
-    python-dp
+    # python-dp
     requests_toolbelt
     scipy
     sqlalchemy>=1.4
diff --git a/packages/syft/tests/syft/lib/pydp/client_pydp_test.py b/packages/syft/tests/syft/lib/pydp/client_pydp_test.py
index 3eb7c487a50..92530d34c2a 100644
--- a/packages/syft/tests/syft/lib/pydp/client_pydp_test.py
+++ b/packages/syft/tests/syft/lib/pydp/client_pydp_test.py
@@ -4,8 +4,6 @@
 # syft absolute
 import syft as sy
 
-pytest.importorskip("pydp")
-
 
 # MADHAVA: this needs fixing
 @pytest.mark.xfail(
@@ -14,6 +12,9 @@
 )
 @pytest.mark.vendor(lib="pydp")
 def test_pydp(root_client: sy.VirtualMachineClient) -> None:
+    # third party
+    import pydp
+
     x_ptr = root_client.pydp.algorithms.laplacian.BoundedMean(
         epsilon=1, lower_bound=1, upper_bound=50, dtype="float"
     )
@@ -34,6 +35,9 @@ def test_pydp(root_client: sy.VirtualMachineClient) -> None:
 )
 @pytest.mark.vendor(lib="pydp")
 def test_pydp_functions(root_client: sy.VirtualMachineClient) -> None:
+    # third party
+    import pydp
+
     x_ptr = root_client.pydp.algorithms.laplacian.BoundedMean(
         epsilon=1, lower_bound=1, upper_bound=50, dtype="float"
     )