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

Jump to bottom

trying to get travis to use correct conda channel and vtks #2150

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

trying to get travis to use correct conda channel and vtks #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42af3f9
trying to get travis to use correct conda channel and vtks
doutriaux1 Jan 10, 2017
9709dce
added conda list to make sure we are installing coorect packages
doutriaux1 Jan 12, 2017
4f005b3
put nighlty back in
doutriaux1 Jan 12, 2017
b3314a9
seems to choke on conda extras
doutriaux1 Jan 12, 2017
21077c4
Merge branch 'master' into fix_travis_conda
doutriaux1 Jan 30, 2017
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
8 changes: 5 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ 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"
- 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
Expand All @@ -33,7 +33,9 @@ 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
- 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
Expand Down
2 changes: 1 addition & 1 deletion CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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@

Expand Down
2 changes: 1 addition & 1 deletion testing/vcs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testing/xmgrace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)