From d34ea0279e06baec07d634c241a40e42050c4ca1 Mon Sep 17 00:00:00 2001 From: Greg Blumberg Date: Thu, 12 Sep 2019 11:43:12 -0400 Subject: [PATCH] Fixing Travis CI install script to support PySide2 --- ci/install.sh | 9 +++------ environment.yml | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/install.sh b/ci/install.sh index faa4a218..93ae890c 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -23,13 +23,10 @@ conda update -q conda conda install -n -q root _license conda info -a conda config --add channels conda-forge -conda create -q -n test-environment python=$PYTHON_VERSION nose pyinstaller conda-build anaconda-client numpy=$NUMPY_VERSION -source activate test-environment +conda env create -f environment.yml +source activate devel +conda install -c conda-forge -q pytest-cov conda-build anaconda-client -pip install --upgrade pip -conda install -q qtpy -conda install -q conda-forge pyside2 -conda install -c conda-forge -q pytest-cov if [[ "$COVERALLS" == "YES" ]]; then echo "Installing coveralls ..." conda install -c conda-forge -q coveralls diff --git a/environment.yml b/environment.yml index e5c1901e..a4b2d02d 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,7 @@ name: devel channels: - - conda-forge/label/testing - conda-forge + - conda-forge/label/testing - anaconda dependencies: - python=3