From 19ea4e4e9f3a6d16f517a4181da77de67fb4945c Mon Sep 17 00:00:00 2001
From: Jeremy Wright <wrightjmf@gmail.com>
Date: Fri, 9 Jul 2021 09:18:55 -0400
Subject: [PATCH] Changes to rely on environment.yml file rather than fighting
 it

---
 appveyor.yml    | 18 ++++++++++--------
 environment.yml |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 42cd3f5e..c41f3758 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -44,17 +44,19 @@ init:
 install:
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
-    - sed -i 's/  - pip:/  - mypy>0.9\n  - black=19.10b0\n  - pip:/' environment.yml
+    - sed -i 's/python>=3.6/python=$PYTHON_VERSION/g' environment.yml
     - conda env create -f environment.yml
     - activate cadquery
-    - cmd: conda install -c conda-forge -c defaults -c cadquery python=%PYTHON_VERSION%
-    - sh: conda install -c conda-forge -c defaults -c cadquery python=$PYTHON_VERSION
+    #- cmd: conda install -c conda-forge -c defaults -c cadquery python=%PYTHON_VERSION%
+    #- sh: conda install -c conda-forge -c defaults -c cadquery python=$PYTHON_VERSION
+    #- pip install black=19.10b0
     - pip install git+https://github.com/CadQuery/OCP-stubs.git@7.5.1
-    - pip install pytest
-    - pip install pytest-cov
-    - pip install path
-    - pip install docutils
-    - pip install codecov
+    #- pip install mypy
+    #- pip install pytest
+    #- pip install pytest-cov
+    #- pip install path
+    #- pip install docutils
+    #- pip install codecov
 
 build: false
 
diff --git a/environment.yml b/environment.yml
index 6ce9c8f7..b9d48b51 100644
--- a/environment.yml
+++ b/environment.yml
@@ -12,6 +12,7 @@ dependencies:
   - sphinx_rtd_theme
   - sphinx-autodoc-typehints
   - black=19.10b0
+  - mypy
   - codecov
   - pytest
   - pytest-cov