From 12862c42f1a854eca847cb6fbf7bc96ad288f4e7 Mon Sep 17 00:00:00 2001
From: "S.P. Mohanty" <spmohanty91@gmail.com>
Date: Wed, 10 Jun 2020 18:59:28 +0200
Subject: [PATCH] Remove cairo mentions from tox and readme

---
 README.md |  1 -
 tox.ini   | 24 ------------------------
 2 files changed, 25 deletions(-)

diff --git a/README.md b/README.md
index cfab0cca..f108e380 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,6 @@ $ conda activate flatland-rl
 * Install the necessary dependencies:
 
 ```console
-$ conda install -c conda-forge cairosvg pycairo
 $ conda install -c anaconda tk  
 ```
 
diff --git a/tox.ini b/tox.ini
index e2260781..0023ee34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,6 @@ commands =
     flake8 flatland tests examples benchmarks
 
 [testenv:docs]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 whitelist_externals = make
 passenv =
@@ -29,8 +28,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
     graphviz
 conda_channels :
@@ -44,7 +41,6 @@ commands =
     make docs
 
 [testenv:coverage]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 whitelist_externals = make
 passenv =
@@ -53,8 +49,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -67,7 +61,6 @@ commands =
     python make_coverage.py
 
 [testenv:benchmarks]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =
     PYTHONPATH = {toxinidir}
@@ -87,7 +80,6 @@ commands =
     python {toxinidir}/benchmarks/benchmark_all_examples.py
 
 [testenv:profiling]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =
     PYTHONPATH = {toxinidir}
@@ -98,8 +90,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -113,7 +103,6 @@ commands =
 
 [testenv:examples]
 ; TODO should examples be run with py36 and py37??
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =
     PYTHONPATH = {toxinidir}
@@ -124,8 +113,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -139,7 +126,6 @@ commands =
 
 [testenv:notebooks]
 ; TODO should examples be run with py36 and py37??
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =
     PYTHONPATH = {toxinidir}
@@ -154,8 +140,6 @@ deps =
     -r{toxinidir}/requirements_dev.txt
     -r{toxinidir}/requirements_continuous_integration.txt
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -170,7 +154,6 @@ commands =
     python {toxinidir}/notebooks/run_all_notebooks.py
 
 [testenv:start_jupyter]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
 basepython = python3.6
 setenv =
     PYTHONPATH = {toxinidir}
@@ -185,8 +168,6 @@ deps =
     -r{toxinidir}/requirements_dev.txt
     -r{toxinidir}/requirements_continuous_integration.txt
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -209,8 +190,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -224,7 +203,6 @@ commands =
     python -m pytest --basetemp={envtmpdir} {toxinidir}
 
 [testenv:py37]
-; exclude py37 from Windows because of incompatibility the pycairo installed through conda for py37
 platform = linux|linux2|darwin
 setenv =
     PYTHONPATH = {toxinidir}
@@ -235,8 +213,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
-- 
GitLab