diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-09-21 13:23:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 13:23:42 +0200 |
| commit | 7db3acd2df38508e107209c912ac0b5ce2663f9c (patch) | |
| tree | 499f0aeadda248781e7c88355030d7d539f03979 | |
| parent | f73859b91a20ae6299dcde08b2327b241be8226f (diff) | |
| download | PROJ-7db3acd2df38508e107209c912ac0b5ce2663f9c.tar.gz PROJ-7db3acd2df38508e107209c912ac0b5ce2663f9c.zip | |
Use Python2 in favour of Python3 which behaves inconsistenly on Travis (#573)
| -rwxr-xr-x | travis/before_install.sh | 16 | ||||
| -rwxr-xr-x | travis/install.sh | 7 |
2 files changed, 16 insertions, 7 deletions
diff --git a/travis/before_install.sh b/travis/before_install.sh index 1404eae3..249cb591 100755 --- a/travis/before_install.sh +++ b/travis/before_install.sh @@ -5,6 +5,16 @@ # 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. -pyenv global system 3.5 -pyenv versions # a bit of debug info +# 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 +python3 --version + +which pip +pip --version diff --git a/travis/install.sh b/travis/install.sh index 70b8e90d..51a8ea2f 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -84,7 +84,6 @@ PROJ_LIB=$GRIDDIR ./src/proj -VC # install & run the working GIGS test # create locations that pyproj understands -python3 --version ln -s src include ln -s src/.libs lib mkdir share @@ -92,12 +91,12 @@ ln -s nad share/proj pwd # install pyproj export CFLAGS= -PROJ_DIR=`pwd` pip3 install -v --user pyproj +PROJ_DIR=`pwd` pip install -v --user pyproj cd test/gigs # run test_json.py -PROJ_LIB=../../nad python3 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 python3 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 +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 |