This is an automated email from the git hooks/post-receive script. afif pushed a commit to branch master in repository falcon.
commit 6cebedcdefe640ed8f0c6e6648a1b385d71ccfb3 Author: Afif Elghraoui <[email protected]> Date: Sat Nov 26 20:16:17 2016 -0800 Update and refresh patches --- debian/patches/build-system.patch | 4 ++-- debian/patches/rdflib.patch | 32 -------------------------------- debian/patches/series | 1 - debian/patches/versioned-deps.patch | 8 +++----- 4 files changed, 5 insertions(+), 40 deletions(-) diff --git a/debian/patches/build-system.patch b/debian/patches/build-system.patch index 0a20571..c14e7cd 100644 --- a/debian/patches/build-system.patch +++ b/debian/patches/build-system.patch @@ -68,11 +68,11 @@ Last-Update: 2016-10-22 + +.PHONY: import-test +import-test: - python -c 'import pypeflow.common; print pypeflow.common' + python -c 'import pypeflow.pwatcher_workflow; print pypeflow.pwatcher_workflow' python -c 'import falcon_kit; print falcon_kit.falcon' + +.PHONY: full-test +full-test: ${MAKE} run-synth0 ${MAKE} -C run/synth0 test - #${MAKE} -C run/synth0 clean + diff --git a/debian/patches/rdflib.patch b/debian/patches/rdflib.patch deleted file mode 100644 index e13090f..0000000 --- a/debian/patches/rdflib.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Update to rdflib 4.x - rdflib-extras is obsolete. See - http://rdflib3.readthedocs.io/en/latest/upgrade3to4.html -Author: Afif Elghraoui <[email protected]> -Forwarded: no -Last-Update: 2016-10-22 ---- falcon.orig/pypeFLOW/setup.py -+++ falcon/pypeFLOW/setup.py -@@ -14,8 +14,7 @@ - package_dir = {'':'.'}, - zip_safe = False, - install_requires=[ -- 'rdflib == 3.4.0', -- 'rdfextras >= 0.1', -+ 'rdflib', - 'html5lib == 0.999999', - 'networkx >=1.7, <=1.10', - ], ---- falcon.orig/pypeFLOW/pypeflow/common.py -+++ falcon/pypeFLOW/pypeflow/common.py -@@ -34,11 +34,6 @@ - import rdflib - try: - from rdflib import ConjunctiveGraph as Graph #work for rdflib-3.1.0 -- # need to install rdfextras for rdflib-3.0.0 -- rdflib.plugin.register('sparql', rdflib.query.Processor, -- 'rdfextras.sparql.processor', 'Processor') -- rdflib.plugin.register('sparql', rdflib.query.Result, -- 'rdfextras.sparql.query', 'SPARQLQueryResult') - except Exception: - from rdflib.Graph import ConjunctiveGraph as Graph #work for rdflib-2.4.2 - from rdflib import Namespace diff --git a/debian/patches/series b/debian/patches/series index 91f7636..37d89b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ build-system.patch -rdflib.patch versioned-deps.patch diff --git a/debian/patches/versioned-deps.patch b/debian/patches/versioned-deps.patch index ebb6af6..8854a1b 100644 --- a/debian/patches/versioned-deps.patch +++ b/debian/patches/versioned-deps.patch @@ -17,13 +17,11 @@ Last-Update: 2016-06-22 ] --- falcon.orig/pypeFLOW/setup.py +++ falcon/pypeFLOW/setup.py -@@ -15,8 +15,8 @@ +@@ -14,7 +14,7 @@ + package_dir = {'':'.'}, zip_safe = False, install_requires=[ - 'rdflib', -- 'html5lib == 0.999999', -- 'networkx >=1.7, <=1.10', -+ 'html5lib', +- 'networkx >=1.7, <=1.11', + 'networkx >=1.7', ], entry_points = {'console_scripts': [ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/falcon.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
