fix travis matrix

This commit is contained in:
ImreSamu 2018-05-19 20:49:47 +02:00
parent 23244fd310
commit 440bf01a8c

View File

@ -36,37 +36,35 @@ matrix:
- conda install --yes -c conda-forge requests - conda install --yes -c conda-forge requests
- pip install csvtomd - pip install csvtomd
script: script:
- run_all.sh - ./run_all.sh
- os: linux
env:
- PY=3.6
- nedocker=NO
sudo: required
before_install:
- sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
- sudo apt-get --yes --force-yes update -qq
- sudo apt-get install --yes gdal-bin jq
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda update --yes conda
- conda info -a
- conda config --add channels conda-forge
- conda create --yes -n test-natural-earth python=$PY
- source activate test-natural-earth
- echo $(python --version)
- conda install --yes -c conda-forge fiona
- python -c "import fiona"
- conda install --yes -c conda-forge sparqlwrapper
- conda install --yes -c conda-forge requests
- pip install csvtomd
script:
- run_all.sh
# - os: linux
# env:
# - PY=3.6
# - nedocker=NO
# sudo: required
# before_install:
# - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
# - sudo apt-get --yes --force-yes update -qq
# - sudo apt-get install --yes gdal-bin jq
# - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
# - bash miniconda.sh -b -p $HOME/miniconda
# - export PATH="$HOME/miniconda/bin:$PATH"
# - hash -r
# - conda update --yes conda
# - conda info -a
# - conda config --add channels conda-forge
# - conda create --yes -n test-natural-earth python=$PY
# - source activate test-natural-earth
# - echo $(python --version)
# - conda install --yes -c conda-forge fiona
# - python -c "import fiona"
# - conda install --yes -c conda-forge sparqlwrapper
# - conda install --yes -c conda-forge requests
# - pip install csvtomd
# script:
# - ./run_all.sh
- language: python - language: python
@ -85,30 +83,27 @@ matrix:
- pip3 install -U csvtomd - pip3 install -U csvtomd
- pip3 install -U requests - pip3 install -U requests
script: script:
- run_all.sh - ./run_all.sh
# - language: python
- language: python # python: 3.5
python: 3.5 # os: linux
os: linux # env:
env: # - nedocker=NO
- nedocker=NO # sudo: required
sudo: required # before_install:
before_install: # - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
- sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes # - sudo apt-get --yes --force-yes update -qq
- sudo apt-get --yes --force-yes update -qq # - sudo apt-get install --yes gdal-bin jq
- sudo apt-get install --yes gdal-bin jq # - pip3 install -U SPARQLWrapper
- pip3 install -U SPARQLWrapper # - pip3 install -U fiona
- pip3 install -U fiona # - python -c "import fiona"
- python -c "import fiona" # - pip3 install -U csvtomd
- pip3 install -U csvtomd # - pip3 install -U requests
- pip3 install -U requests # script:
script: # - ./run_all.sh
- run_all.sh
- services: docker - services: docker