diff options
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/before_install.sh | 15 | ||||
| -rwxr-xr-x | travis/install.sh | 17 | ||||
| -rwxr-xr-x | travis/osx/before_install.sh | 2 |
3 files changed, 0 insertions, 34 deletions
diff --git a/travis/before_install.sh b/travis/before_install.sh index ccf59936..ac45a6d4 100755 --- a/travis/before_install.sh +++ b/travis/before_install.sh @@ -2,18 +2,3 @@ # All platform-specific before_install scripts starts by running this # "global" before_install script. - -# Specify which version of python to use. The default python to use on Travis -# can vary from platform to platform, so we use pyenv to make sure we use -# a version that works for the complete build processs. (Not in use at the moment, -# since the pyenv setup on Travis is not consistent across platforms and partly -# broken as well) -#pyenv global system 3.5 -#pyenv versions # a bit of debug info - -# What is the current python setup? -which python -python --version - -which pip -pip --version diff --git a/travis/install.sh b/travis/install.sh index 5f520902..8b7a7b90 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -82,21 +82,4 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then make -j3 PROJ_LIB=$GRIDDIR make check -# install & run the working GIGS test - # create locations that pyproj understands -ln -s src include -ln -s src/.libs lib -mkdir share -ln -s nad share/proj -pwd - # install pyproj -export CFLAGS= -PROJ_DIR=`pwd` pip install -v --user pyproj - -cd test/gigs - # run test_json.py -PROJ_LIB=../../nad python test_json.py --test conversion 5101.1-jhs.json 5101.4-jhs-etmerc.json 5105.2.json 5106.json 5108.json 5110.json 5111.1.json -PROJ_LIB=../../nad python test_json.py 5101.2-jhs.json 5101.3-jhs.json 5102.1.json 5103.1.json 5103.2.json 5103.3.json 5107.json 5109.json 5112.json 5113.json 5201.json 5208.json -cd ../.. - mv src/.libs/*.gc* src diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh index e4d3b00d..17c0e141 100755 --- a/travis/osx/before_install.sh +++ b/travis/osx/before_install.sh @@ -2,8 +2,6 @@ set -e -sudo easy_install pip - ./travis/before_install.sh brew update |
