Skip to content

Commit

Permalink
Merge 8adfc69 into 44ed11f
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham committed Nov 17, 2018
2 parents 44ed11f + 8adfc69 commit 6e4fe19
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ install:
# Create the test environment.
- cmd: conda create -y -n testenv python="%CONDA_PY%"
- cmd: conda env update -n testenv --file environment_ci.yml
- cmd: activate testenv
- cmd: conda activate testenv

# Skip .NET project specific build phase.
build: off
Expand Down
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ 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
Expand All @@ -32,7 +33,7 @@ install:
- conda remove -y --force -n testenv openssl
- 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
- conda activate testenv

# command to run tests, e.g. python setup.py test
script:
Expand All @@ -44,12 +45,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

0 comments on commit 6e4fe19

Please sign in to comment.