Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no dowgrade #39

Merged
merged 6 commits into from
Feb 27, 2019
Merged

no dowgrade #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
986c75c
no dowgrade
doutriaux1 Feb 23, 2019
3bcb507
trying to force 3.7
doutriaux1 Feb 25, 2019
7264a24
using py36 for now
doutriaux1 Feb 26, 2019
0ade994
forcing 36 in travis
doutriaux1 Feb 26, 2019
8f3f134
need to fix travis
doutriaux1 Feb 27, 2019
7f2e6c4
fix travis, remove numpy restrictiion
doutriaux1 Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@ aliases:
- &create_conda_env
name: create_conda_env
environment:
PKGS: "cdms2 'libcdms>=3.1.2' mesalib matplotlib 'numpy>1.14' vcs 'proj4<5' testsrunner 'vtk-cdat>8.1'"
PKGS: "cdms2 'libcdms>=3.1.2' mesalib matplotlib numpy vcs 'proj4<5' testsrunner vtk-cdat"
CHANNELS: "-c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat"
command: |
export PATH=$WORKDIR/miniconda/bin:$PATH
conda config --set always_yes yes --set changeps1 no
conda update -y -q conda
conda config --set anaconda_upload no
conda install -f "conda<4.6"
if [[ $PY_VER = "py2" ]]; then
conda create -q -n $PY_VER $CHANNELS $PKGS 'python<3' $FFMPEG ${CONDA_COMPILERS}
else
conda create -q -n $PY_VER $CHANNELS $PKGS 'python>3' $FFMPEG ${CONDA_COMPILERS} $COVERAGE_PKGS
conda create -q -n $PY_VER $CHANNELS $PKGS 'python>=3.6' $FFMPEG ${CONDA_COMPILERS} $COVERAGE_PKGS
fi

- &setup_vcsaddons
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ script:
- export UVCDAT_SETUP_PATH=${HOME}
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export COMPILERS=gcc_linux-64; export LDSHARED_FLAGS="-shared -pthread" ; export FFMPEG="'ffmpeg>4.0.1'" ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export COMPILERS=clang_osx-64; export LDSHARED_FLAGS="-bundle -undefined dynamic_lookup" ; export FFMPEG="'ffmpeg>=4.1'" ; fi
- conda create -q -n py2 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 'libcdms >=3.1.2' testsrunner matplotlib mesalib vcs $FFMPEG "proj4<5" "python<3" ${COMPILERS}
- conda create -q -n py3 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 'libcdms >=3.1.2' testsrunner matplotlib mesalib vcs $FFMPEG "proj4<5" "python>3" ${COMPILERS}
- conda create -q -n py2 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 'libcdms>=3.1.2' testsrunner matplotlib mesalib vcs $FFMPEG "proj4<5" "python<3" ${COMPILERS}
- conda create -q -n py3 -c cdat/label/nightly -c cdat-forge -c conda-forge -c cdat cdms2 'libcdms>=3.1.2' testsrunner matplotlib mesalib vcs $FFMPEG "proj4<5" "python=3.6" ${COMPILERS}
- echo $TRAVIS_BRANCH
- export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH
- echo $TRAVIS_EVENT_TYPE
Expand Down