Skip to content

Commit

Permalink
pushing to cdat channel
Browse files Browse the repository at this point in the history
  • Loading branch information
doutriaux1 committed Mar 14, 2018
1 parent fdd6660 commit 7703b9a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ before_install:
- conda update -y -q conda
#- conda install gcc
script:
- conda create -n py2 -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose libgfortran
- conda create -n py2 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose libgfortran
- ln -s ~/miniconda/envs/py2/lib/libgfortran.so.3.0.0 ~/miniconda/envs/py2/lib/libgfortran.so
- ls -l ~/miniconda/envs/py2/lib
- export UVCDAT_ANONYMOUS_LOG=False
Expand All @@ -22,7 +22,7 @@ script:
- python setup.py install
- python run_tests.py -v2
- rm -rf build
- conda create -n py3 -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose "python>3" libgfortran
- conda create -n py3 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose "python>3" libgfortran
- ln -s ~/miniconda/envs/py3/lib/libgfortran.so.3.0.0 ~/miniconda/envs/py3/lib/libgfortran.so
- ls -l ~/miniconda/envs/py3/lib
- source activate py3
Expand Down
4 changes: 2 additions & 2 deletions ci-support/circleci_mac_dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
ls
pwd
export PATH=${HOME}/miniconda/bin:${PATH}
conda create -n py3 -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose "python>3"
conda create -n py2 -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose
conda create -n py3 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose "python>3"
conda create -n py2 -c cdat/label/nightly -c uvcdat/label/nightly -c conda-forge -c uvcdat cdat_info libcdms libdrs_f numpy flake8 nose
export UVCDAT_ANONYMOUS_LOG=False
source activate py3
python setup.py install
Expand Down
2 changes: 1 addition & 1 deletion ci-support/conda_upload.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
PKG_NAME=cdtime
USER=uvcdat
USER=cdat
export PATH="$HOME/miniconda/bin:$PATH"
echo "Trying to upload conda"
if [ $(uname) == "Linux" ]; then
Expand Down

0 comments on commit 7703b9a

Please sign in to comment.