Skip to content

Commit

Permalink
Reverted conda test environment name, and added conda build and anaco…
Browse files Browse the repository at this point in the history
…nda install to script
  • Loading branch information
kyleniemeyer committed May 2, 2019
1 parent 55de950 commit a11ff60
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ install:
- if [[ -z "$TRAVIS_TAG" ]]; then
sed -i -e "s/\${PYTHON}/"${PYTHON}"/" test-environment.yaml;
conda env create -qf test-environment.yaml;
conda activate py${PYTHON};
conda activate test-environment;
else
if [[ "$PYTHON" == "3.6" && "$TRAVIS_OS_NAME" == "linux" ]]; then
conda env update -qn base -f build-environment.yaml;
Expand All @@ -65,6 +65,7 @@ script:
doctr deploy .;
fi
else
conda install -yq anaconda-client conda-build
conda build conda.recipe --python=${PYTHON};
anaconda -t $ANACONDA_TOKEN upload $HOME/miniconda/conda-bld/*/pyteck*.tar.bz2;
fi
Expand Down
2 changes: 1 addition & 1 deletion pyteck/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version_info__ = (0, 2, 5, 'a6')
__version_info__ = (0, 2, 5, 'a7')
__version__ = '.'.join(map(str, __version_info__[:3]))
if len(__version_info__) == 4:
__version__ += __version_info__[-1]
2 changes: 1 addition & 1 deletion test-environment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: py${PYTHON}
name: test-environment
channels:
- defaults
- conda-forge
Expand Down

0 comments on commit a11ff60

Please sign in to comment.