Skip to content

Commit

Permalink
testing newest cdms, no restriciton (#617)
Browse files Browse the repository at this point in the history
* testing newest cdms, no restriciton

* upping mac xcode

* rerun tests

* try with just python 3.6 on mac

* try with just python 3.6 on mac

* retry tests

* temporarily rerun just macos_pmp_py3

* temporarily rerun just macos_pmp_py3 -- added no_output_timeout: 30m

* rerun all

* removed unused setup_miniconda in .circleci/config.yml
  • Loading branch information
doutriaux1 committed Sep 25, 2019
1 parent 64c5d4c commit 4bd8a5b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
23 changes: 10 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,10 @@ checkout:
- ./ci-support/checkout_merge_commit.sh

aliases:

- &setup_miniconda
name: setup_miniconda
command: |
mkdir -p workspace
git clone -b validateNightly [email protected]:CDAT/cdat workspace/cdat --depth=1
python workspace/cdat/scripts/install_miniconda.py -w $WORKDIR -p 'py3.6'
- &create_conda_env
name: create_conda_env
environment:
PKGS: "'cdms2<3.1.2.2019' vcs vcsaddons mesalib matplotlib scipy cia testsrunner 'proj4<5' 'vtk-cdat>8.1' libnetcdf=4.6.2"
PKGS: "vcs vcsaddons mesalib matplotlib scipy cia testsrunner 'proj4<5' 'vtk-cdat>8.1' libnetcdf=4.6.2"
CHANNELS: "-c cdat/label/nightly -c conda-forge -c pcmdi"
command: |
if [ -d ${HOME}/miniconda ]; then
Expand Down Expand Up @@ -44,6 +36,8 @@ aliases:
export PATH=${HOME}/miniconda/bin:$PATH
source activate cdat
python setup.py install
conda list
conda list --verbose cdms2
- &run_pmp_tests
name: run_pmp_tests
Expand All @@ -54,7 +48,8 @@ aliases:
source activate cdat
python run_tests.py -H -v2 $COVERAGE
RESULT=$?
echo "*** $PY_VER test result: ${RESULT}"
echo "** $PY_VER test result: ${RESULT}"
no_output_timeout: 30m

- &run_coveralls
name: run_coveralls
Expand Down Expand Up @@ -94,7 +89,7 @@ aliases:
jobs:
macos_pmp_py2:
macos:
xcode: "9.2.0"
xcode: "10.2.0"
environment:
WORKDIR: "test_macos_pmp_py2"
OS: "osx-64"
Expand All @@ -120,7 +115,7 @@ jobs:

macos_pmp_py3:
macos:
xcode: "9.2.0"
xcode: "10.2.0"
environment:
WORKDIR: "test_macos_pmp_py3"
OS: "osx-64"
Expand Down Expand Up @@ -205,8 +200,10 @@ workflows:
version: 2
pcmdi_metrics:
jobs:
- macos_pmp_py3
- macos_pmp_py2
- macos_pmp_py3:
requires:
- macos_pmp_py2
- linux_pmp_py2
- linux_pmp_py3:
requires:
Expand Down
1 change: 0 additions & 1 deletion recipes/pcmdi_metrics/meta.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ requirements:
- jupyterlab
- nb_conda
- nb_conda_kernels
- cdms2 <3.1.2.2019



Expand Down

0 comments on commit 4bd8a5b

Please sign in to comment.