Skip to content

Commit

Permalink
Merge 414a91c into 44ed11f
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham committed Nov 19, 2018
2 parents 44ed11f + 414a91c commit 8ed9ca2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion environment_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8ed9ca2

Please sign in to comment.