diff --git a/.appveyor.yml b/.appveyor.yml index 385e913..5ac7a9e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -64,9 +64,10 @@ install: - cmd: conda config --get # Create the test environment. - - cmd: conda create -y -n testenv python="%CONDA_PY%" + - cmd: conda create -y -n testenv + - cmd: conda activate testenv + - cmd: echo "python %CONDA_PY%.*" >> "%CONDA_PREFIX%\\conda-meta\\pinned" - cmd: conda env update -n testenv --file environment_ci.yml - - cmd: activate testenv # Skip .NET project specific build phase. build: off diff --git a/.travis.yml b/.travis.yml index 59849de..05517f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,18 +21,18 @@ install: - openssl md5 miniconda.sh | grep e1045ee415162f944b6aebfe560b8fee - bash miniconda.sh -b -p ~/miniconda - rm miniconda.sh - - source ~/miniconda/bin/activate root + - source ~/miniconda/etc/profile.d/conda.sh + - conda activate - conda config --set show_channel_urls true - conda update -y -n root --all - conda install -y -n root conda-build - conda clean -tipsy # Create the test environment. - - conda create -y -n testenv python="${PYVER}" - - conda remove -y --force -n testenv openssl + - conda create -y -n testenv + - conda activate testenv + - echo "python ${PYVER}.*" >> "${CONDA_PREFIX}/conda-meta/pinned" - conda env update -n testenv --file environment_ci.yml - - conda list --full-name -n testenv openssl || conda install -y -n testenv openssl - - source activate testenv # command to run tests, e.g. python setup.py test script: @@ -44,12 +44,12 @@ script: # Report coverage after_success: - - source activate root + - conda activate - conda create -y -n dplenv python="3.5"; - conda remove -y --force -n dplenv openssl - conda env update -n dplenv --file environment_dpl.yml - conda list --full-name -n dplenv openssl || conda install -y -n dplenv openssl - - source activate dplenv + - conda activate dplenv - coveralls # Disable email notifications. diff --git a/environment_ci.yml b/environment_ci.yml index 6e5aec8..91f50ff 100644 --- a/environment_ci.yml +++ b/environment_ci.yml @@ -5,7 +5,7 @@ channels: dependencies: - pip==18.1 - - wheel==0.32.2 + - wheel==0.32.0 - coverage==4.5.2 - pytest==3.10.1 - cython==0.29