Merge pull request #259 from adam-urbanczyk/master

Make CI use cadquery i.s.o. freecad conda channel
dcowden · Apr 29, 2018 · 7a9317a · 7a9317a
2 parents c4df65c + cf695f6
commit 7a9317a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
     conda config --set always_yes yes --set changeps1 no;
     conda update -q conda;
     conda info -a;
-    conda create -y -q -n freecad_cq3 -c freecad -c freecad/label/broken -c conda-forge freecad=0.17=py36_11 occt=7.2.0=occt7.2.0_0 python=3.6 pyparsing conda mock coverage codecov;
+    conda create -y -q -n freecad_cq3 -c cadquery -c conda-forge freecad=0.17 python=3.6 pyparsing conda mock coverage codecov;
     source ~/miniconda/bin/activate freecad_cq3;
   else
     sudo add-apt-repository -y ppa:freecad-maintainers/freecad-stable;

diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@ install:
     - set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
     - conda config --set always_yes yes
     - conda update -q conda
-    - conda create --quiet --name cqtest -c freecad -c freecad/label/broken -c conda-forge python=%PYTHON_VERSION% freecad=0.17=py36_vc14_13 occt=7.2.0 python=3.6 pyparsing mock coverage codecov
+    - conda create --quiet --name cqtest -c cadquery -c conda-forge python=%PYTHON_VERSION% freecad=0.17 python=3.6 pyparsing mock coverage codecov
     - activate cqtest
     - python setup.py install