From 42af3f979b1bcdf0e99d972f68740bd6608cbc28 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 10 Jan 2017 08:45:03 -0800 Subject: [PATCH 1/4] trying to get travis to use correct conda channel and vtks --- .travis.yml | 5 +++-- CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5cdc4c706..1d39c62873 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,12 @@ before_install: - bash miniconda.sh -b -p $HOME/miniconda - conda config --set always_yes yes --set changeps1 no - conda update -y -q conda -- conda install openssl=1.0.2d +#- conda install openssl=1.0.2d - conda install cmake script: - export NOX="OFF" -- export CONDA_XTRA="uvcdat" +# we need nightly so that we pick up post-release externals packages +- export CONDA_XTRA="uvcdat/label/nightly -c uvcdat" - export NCPUS="4" - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA="uvcdat -c spyder-ide libxcb"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NCPUS="8" ; fi diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in index baddecc0ae..9ed0ac4aea 100755 --- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in +++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in @@ -1,6 +1,6 @@ #!/usr/bin/env bash -@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@ ipython libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor proj4>=4.9.2 vtk@CONDA_NOX@ libcdms flake8 requests numpy hdf5=1.8.16 cycler matplotlib --show-channel-urls --copy +@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c conda-forge -c @CONDA_CHANNEL_UVCDAT@ ipython libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor proj4>4.9.2 vtk-cdat@CONDA_NOX@ libcdms flake8 requests numpy hdf5 cycler matplotlib --show-channel-urls --copy source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@ From 9709dced711e3f07c3f23ad578f8a7bde527da85 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Wed, 11 Jan 2017 16:59:46 -0800 Subject: [PATCH 2/4] added conda list to make sure we are installing coorect packages turned off flake8 errors --- .travis.yml | 3 +-- testing/vcs/CMakeLists.txt | 2 +- testing/xmgrace/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d39c62873..e4141ce12c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,6 @@ before_install: - conda install cmake script: - export NOX="OFF" -# we need nightly so that we pick up post-release externals packages -- export CONDA_XTRA="uvcdat/label/nightly -c uvcdat" - export NCPUS="4" - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA="uvcdat -c spyder-ide libxcb"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NCPUS="8" ; fi @@ -35,6 +33,7 @@ script: - echo "OFFSCREEN IS:"$NOX - cmake -DGIT_PROTOCOL=git:// ../uvcdat -DCDAT_BUILD_OFFSCREEN=$NOX -DCONDA_CHANNEL_UVCDAT="$CONDA_XTRA" - make +- conda list - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ctest -VV -R download_sample_data ; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ctest -j$NCPUS -D Experimental -R vcs ; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ctest -j$NCPUS -D Experimental ; fi diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt index 6065f75135..d7dd3e62a6 100644 --- a/testing/vcs/CMakeLists.txt +++ b/testing/vcs/CMakeLists.txt @@ -5,7 +5,7 @@ cdat_add_test(flake8_vcs --show-source # Show context for detected errors --statistics # Show summary of errors at end of output --max-line-length=120 # Reasonable line length - --ignore=F999,E121,E123,E126,E226,E24,E704 # recent version show zillions of errors if object come from an import * line + --ignore=F405,E305,F999,E121,E123,E126,E226,E24,E704 # recent version show zillions of errors if object come from an import * line ) cdat_add_test(test_vcs_bad_png_path diff --git a/testing/xmgrace/CMakeLists.txt b/testing/xmgrace/CMakeLists.txt index 94528f4f5a..2a38a39cf5 100644 --- a/testing/xmgrace/CMakeLists.txt +++ b/testing/xmgrace/CMakeLists.txt @@ -3,4 +3,5 @@ cdat_add_test(flake8_xmgrace --show-source # Show context for detected errors --statistics # Show summary of errors at end of output --max-line-length=128 # Max line 128 not 80 + --ignore=F405,E305,F999,E121,E123,E126,E226,E24,E704 # recent version show zillions of errors if object come from an import * line ) From 4f005b3dd5511075282204c1647acd8ac66ce125 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Thu, 12 Jan 2017 09:21:22 -0800 Subject: [PATCH 3/4] put nighlty back in --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e4141ce12c..51f17589da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ before_install: script: - export NOX="OFF" - export NCPUS="4" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA="uvcdat -c spyder-ide libxcb"; fi +- export CONDA_XTRA="uvcdat/label/nightly -c uvcdat" +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA=${CONDA_XTRA}+" -c spyder-ide libxcb"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NCPUS="8" ; fi - echo $TRAVIS_BRANCH - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH From b3314a95976cb6c8a657c0296175cd1631aae8e2 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Thu, 12 Jan 2017 09:40:01 -0800 Subject: [PATCH 4/4] seems to choke on conda extras --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51f17589da..75987e8040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ script: - export NOX="OFF" - export NCPUS="4" - export CONDA_XTRA="uvcdat/label/nightly -c uvcdat" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA=${CONDA_XTRA}+" -c spyder-ide libxcb"; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA=${CONDA_XTRA}" -c spyder-ide libxcb"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NCPUS="8" ; fi - echo $TRAVIS_BRANCH - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH @@ -33,6 +33,7 @@ script: - cd _build - echo "OFFSCREEN IS:"$NOX - cmake -DGIT_PROTOCOL=git:// ../uvcdat -DCDAT_BUILD_OFFSCREEN=$NOX -DCONDA_CHANNEL_UVCDAT="$CONDA_XTRA" +- echo "CNODA EXTEAS WERE:"${CONDA_XTRA} - make - conda list - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ctest -VV -R download_sample_data ; fi