fix(frontend-python): macos os tests without graphviz

zama-ai · Feb 19, 2024 · c950383 · c950383
1 parent b324ca8
commit c950383
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/concrete_python_test_macos.yml b/.github/workflows/concrete_python_test_macos.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Install OS Dependencies
         run: |
-          brew install ninja ccache graphviz
+          brew install ninja ccache
 
       - name: Setup rust toolchain for concrete-cpu
         uses: ./.github/workflows/setup_rust_toolchain_for_concrete_cpu
@@ -75,8 +75,6 @@ jobs:
           
           . .venv/bin/activate
           
-          CFLAGS=-I$(brew --prefix graphviz)/include LDFLAGS=-L$(brew --prefix graphviz)/lib pip --no-cache-dir install pygraphviz
-          
           pip install -r requirements.dev.txt
           pip install -r requirements.txt
           
@@ -111,8 +109,6 @@ jobs:
           python3.10 -m venv .testenv
           . .testenv/bin/activate
           
-          CFLAGS=-I$(brew --prefix graphviz)/include LDFLAGS=-L$(brew --prefix graphviz)/lib pip --no-cache-dir install pygraphviz
-          
           pip install $GITHUB_WORKSPACE/frontends/concrete-python/dist/*macos*.whl
           pip install -r $GITHUB_WORKSPACE/frontends/concrete-python/requirements.dev.txt
 
@@ -123,7 +119,7 @@ jobs:
           find .testenv/lib/python3.10/site-packages -not \( -path .testenv/lib/python3.10/site-packages/concrete -prune \) -name 'lib*omp5.dylib' -or -name 'lib*omp.dylib' | xargs -n 1  ln -f -s $(pwd)/.testenv/lib/python3.10/site-packages/concrete/.dylibs/libomp.dylib
 
           cp -R $GITHUB_WORKSPACE/frontends/concrete-python/tests ./tests
-          pytest tests -svv -n auto --key-cache "./KeySetCache" -m "not dataflow"
+          pytest tests -svv -n auto --key-cache "./KeySetCache" -m "not dataflow and not graphviz"
 
       - name: Cleanup host
         if: success() || failure()

diff --git a/frontends/concrete-python/requirements.dev-full.txt b/frontends/concrete-python/requirements.dev-full.txt
@@ -0,0 +1,5 @@
+-r requiremets.dev.txt
+
+matplotlib>=3.7
+pillow>=10.2
+pygraphviz>=1.11
diff --git a/frontends/concrete-python/requirements.dev.txt b/frontends/concrete-python/requirements.dev.txt
@@ -16,7 +16,3 @@ ruff==0.0.259
 auditwheel==5.3.0; sys_platform == 'linux'
 delocate==0.10.4; sys_platform == 'darwin'
 wheel==0.40.0
-
-matplotlib>=3.7
-pillow>=10.2
-pygraphviz>=1.11
diff --git a/frontends/concrete-python/tests/compilation/test_circuit.py b/frontends/concrete-python/tests/compilation/test_circuit.py
@@ -29,6 +29,7 @@ def f(x, y):
     assert str(circuit) == circuit.graph.format()
 
 
+@pytest.mark.graphviz
 def test_circuit_draw(helpers):
     """
     Test `draw` method of `Circuit` class.