diff options
| author | Joern Hees <dev@joernhees.de> | 2016-07-27 00:48:14 +0200 |
|---|---|---|
| committer | Joern Hees <dev@joernhees.de> | 2016-07-27 00:55:33 +0200 |
| commit | 6c1bdfc818da314055639d2447eab5507cf180ec (patch) | |
| tree | 5526dedb67cead495b27c5414cc002b87950b64f | |
| parent | e41617bf7eec79ae211f048845840c9786b06a2e (diff) | |
| download | rdflib-6c1bdfc818da314055639d2447eab5507cf180ec.tar.gz | |
travis updates setuptools and pip before installing
travis python seems to come with quite an old setuptools and pip, too old for html5lib
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | requirements.py2.txt | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4901b1ea..180ec3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ # http://travis-ci.org/#!/RDFLib/rdflib -language: python sudo: false +language: python branches: only: + # only build master and release branches (merge request are built anyhow) - master - /^\d+\.\d+\.\d+(-.*)?$/ +git: + depth: 3 python: # - 2.5 @@ -17,10 +20,11 @@ python: # - "pypy" before_install: + - pip install -U setuptools pip # seems travis comes with a too old setuptools for html5lib - bash .travis.fuseki_install_optional.sh install: - - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install --default-timeout 60 -r requirements.py2.txt; pip install --default-timeout 60 "html5lib";fi + - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install --default-timeout 60 -r requirements.py2.txt; fi - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install --default-timeout 60 -r requirements.py3.txt; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --default-timeout 60 ordereddict 'networkx<1.10' ; fi - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then pip install --default-timeout 60 networkx ; fi diff --git a/requirements.py2.txt b/requirements.py2.txt index 4a8584d2..ba62fed3 100644 --- a/requirements.py2.txt +++ b/requirements.py2.txt @@ -1,4 +1,5 @@ flake8 +html5lib isodate pyparsing<=1.5.7 SPARQLWrapper>=1.6.2 |