Merge pull request #39 from CDAT/no_downgrade

no dowgrade
CDAT · Feb 27, 2019 · f254fe5 · f254fe5
2 parents 2834c20 + 7f2e6c4
commit f254fe5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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

diff --git a/.travis.yml b/.travis.yml
@@ -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