From cf695f65b70ddf8678ee4e54492aa1e2b81c662e Mon Sep 17 00:00:00 2001 From: adam-urbanczyk Date: Sun, 29 Apr 2018 15:14:32 +0200 Subject: [PATCH] Make CI use cadquery i.s.o. freecad conda channel --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d61778e..1d07c1e 100644 --- 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 index 892835b..427f287 100644 --- 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