From 6c1bdfc818da314055639d2447eab5507cf180ec Mon Sep 17 00:00:00 2001 From: Joern Hees Date: Wed, 27 Jul 2016 00:48:14 +0200 Subject: travis updates setuptools and pip before installing travis python seems to come with quite an old setuptools and pip, too old for html5lib --- .travis.yml | 8 ++++++-- 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 -- cgit v1.2.1 From 8c5c0e3418066a872a15749f2b285b1a9e2b4ef1 Mon Sep 17 00:00:00 2001 From: Joern Hees Date: Wed, 27 Jul 2016 01:29:17 +0200 Subject: updated fuseki used in travis tests to 2.4.0 --- .travis.fuseki_install_optional.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.fuseki_install_optional.sh b/.travis.fuseki_install_optional.sh index defdf29d..49e91f2c 100644 --- a/.travis.fuseki_install_optional.sh +++ b/.travis.fuseki_install_optional.sh @@ -2,11 +2,11 @@ set -v -uri="http://archive.eu.apache.org/dist/jena/binaries/jena-fuseki1-1.1.2-distribution.tar.gz" +uri="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-2.4.0.tar.gz" if wget "$uri" && - tar -zxf jena-fuseki*-distribution.tar.gz && - mv jena-fuseki*/ fuseki && + tar -zxf *jena*fuseki*.tar.gz && + mv *jena*fuseki*/ fuseki && cd fuseki ; then # normal SPARQLStore & Dataset tests: bash fuseki-server --port 3030 --debug --update --mem /db &>fuseki.log & -- cgit v1.2.1 From 3f697beb9f896695539f1f34e698f9807ac62ba2 Mon Sep 17 00:00:00 2001 From: Joern Hees Date: Wed, 27 Jul 2016 01:29:52 +0200 Subject: removed now unnecessary version restriction from SPARQLWrapper --- requirements.py2.txt | 2 +- requirements.py3.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.py2.txt b/requirements.py2.txt index ba62fed3..4f8f97cf 100644 --- a/requirements.py2.txt +++ b/requirements.py2.txt @@ -2,4 +2,4 @@ flake8 html5lib isodate pyparsing<=1.5.7 -SPARQLWrapper>=1.6.2 +SPARQLWrapper diff --git a/requirements.py3.txt b/requirements.py3.txt index c48e8346..2ab81d3d 100644 --- a/requirements.py3.txt +++ b/requirements.py3.txt @@ -2,4 +2,4 @@ pyparsing flake8 html5lib isodate -SPARQLWrapper>=1.6.2 +SPARQLWrapper -- cgit v1.2.1 From 877fb0d3b6025ccde22ea2fb2b3b8bb8abea1ea7 Mon Sep 17 00:00:00 2001 From: Joern Hees Date: Wed, 27 Jul 2016 02:23:49 +0200 Subject: pinning html5lib to 1.0b8 for now seems the new version changed its API --- requirements.py2.txt | 2 +- requirements.py3.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.py2.txt b/requirements.py2.txt index 4f8f97cf..3da97d62 100644 --- a/requirements.py2.txt +++ b/requirements.py2.txt @@ -1,5 +1,5 @@ flake8 -html5lib +html5lib==1.0b8 isodate pyparsing<=1.5.7 SPARQLWrapper diff --git a/requirements.py3.txt b/requirements.py3.txt index 2ab81d3d..5005d8bf 100644 --- a/requirements.py3.txt +++ b/requirements.py3.txt @@ -1,5 +1,5 @@ -pyparsing flake8 -html5lib +html5lib==1.0b8 isodate +pyparsing SPARQLWrapper -- cgit v1.2.1 From bce67bbab2fce21769ee61c3eb3f93ec85c36740 Mon Sep 17 00:00:00 2001 From: Joern Hees Date: Wed, 27 Jul 2016 02:38:34 +0200 Subject: only run flake8 in latest py2 and py3 version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 180ec3d6..a22cf0cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ install: - python setup.py install before_script: - - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then flake8 --exclude=pyRdfa,extras,host,transform,rdfs,sparql,results,pyMicrodata --exit-zero rdflib; fi + - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then flake8 --exclude=pyRdfa,extras,host,transform,rdfs,sparql,results,pyMicrodata --exit-zero rdflib; fi script: # Must run the tests in build/src so python3 doesn't get confused and run -- cgit v1.2.1