Skip to content

Commit

Permalink
Merge e8ef687 into 11f1ce5
Browse files Browse the repository at this point in the history
  • Loading branch information
rasbt committed Nov 13, 2019
2 parents 11f1ce5 + e8ef687 commit 7679579
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Expand Up @@ -2,8 +2,8 @@ build: false

environment:
matrix:
- PYTHON_VERSION: 3.8
MINICONDA: C:/Miniconda36-x64
- PYTHON_VERSION: 3.7
MINICONDA: C:/Miniconda37-x64
init:
- ECHO %PYTHON_VERSION% %MINICONDA%
- ECHO conda --version
Expand All @@ -15,7 +15,7 @@ install:
- conda info -a
- conda create -q -n test-environment python=%PYTHON_VERSION% numpy scipy scikit-learn pandas joblib pytest
- activate test-environment
- pip install dlib
- conda install -c conda-forge dlib=19.4
- pip install imageio
- pip install scikit-image

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -20,7 +20,7 @@ matrix:
- os: linux
sudo: required
python: 3.8
env: LATEST="false" IMAGE="true" COVERAGE="false" NUMPY_VERSION="1.16.2" SCIPY_VERSION="1.2.1" SKLEARN_VERSION="0.20.3" JOBLIB_VERSION=0.13.1 PANDAS_VERSION="0.24.2" MINICONDA_PYTHON_VERSION=3.7
env: LATEST="false" IMAGE="true" COVERAGE="false" NUMPY_VERSION="1.16.2" SCIPY_VERSION="1.2.1" SKLEARN_VERSION="0.20.3" JOBLIB_VERSION=0.13.1 PANDAS_VERSION="0.24.2" IMAGEIO_VERSION="2.5.0" SKIMAGE_VERSION="0.15.0" DLIB_VERSION="19.17.0" MINICONDA_PYTHON_VERSION=3.7
- os: linux
python: 3.8
env: LATEST="true" IMAGE="true" COVERAGE="true" NOTEBOOKS="true" MINICONDA_PYTHON_VERSION=3.7
Expand Down
13 changes: 10 additions & 3 deletions ci/.travis_install.sh
Expand Up @@ -43,9 +43,16 @@ conda install pytest


if [ "${IMAGE}" = "true" ]; then
pip install dlib
pip install imageio
pip install scikit-image

if [ "${LATEST}" = "true" ]; then
pip install dlib
pip install imageio
pip install scikit-image
else
pip install dlib=="$DLIB_VERSION"
pip install imageio=="$IMAGEIO_VERSION"
pip install scikit-image=="$SKIMAGE_VERSION"
fi
fi

if [ "${COVERAGE}" = "true" ]; then
Expand Down

0 comments on commit 7679579

Please sign in to comment.