Attachment 869937 Details for Bug 1070074 – Unpin html5lib version requirement

[patch] Unpin html5lib version requirement

0002-Unpin-html5lib-requirement.patch (text/plain), 2.82 KB, created by Dan Scott on 2014-03-03 14:07:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Scott

Created: 2014-03-03 14:07:12 UTC

Size: 2.82 KB

patch

obsolete

>From 1252b6fb67b029c4467716c0cd6873b545e94c12 Mon Sep 17 00:00:00 2001
>From: Dan Scott <dan@coffeecode.net>
>Date: Wed, 26 Feb 2014 14:34:14 -0500
>Subject: [PATCH 2/4] Unpin html5lib requirement
>
>Per https://github.com/RDFLib/rdflib/pull/360 - remove the pinning of html5lib
>to 0.95, as versions after 1.0b2 resolve the regression. This patch matches
>the upstream version.
>
>Signed-off-by: Dan Scott <dan@coffeecode.net>
>---
> python-rdflib.spec               |  2 ++
> unpin-html5lib-requirement.patch | 34 ++++++++++++++++++++++++++++++++++
> 2 files changed, 36 insertions(+)
> create mode 100644 unpin-html5lib-requirement.patch
>
>diff --git a/python-rdflib.spec b/python-rdflib.spec
>index 6a82397..d75cdf8 100644
>--- a/python-rdflib.spec
>+++ b/python-rdflib.spec
>@@ -10,6 +10,7 @@ License:        BSD
> URL:            https://github.com/RDFLib/rdflib
> Source0:        http://pypi.python.org/packages/source/r/rdflib/rdflib-%{version}.tar.gz
> Patch1:         python-rdflib-skip-SPARQLStore-test.patch
>+Patch2:         unpin-html5lib-requirement.patch
> BuildArch:      noarch
> 
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>@@ -42,6 +43,7 @@ A SPARQL 1.1 engine is also included.
> %prep
> %setup -q -n rdflib-%{version}
> %patch1 -p1
>+%patch2 -p1
> find -name "*.pyc" -delete
> 
> sed -i -e 's|_sn_gen=bnode_uuid()|_sn_gen=bnode_uuid|' test/test_bnode_ncname.py
>diff --git a/unpin-html5lib-requirement.patch b/unpin-html5lib-requirement.patch
>new file mode 100644
>index 0000000..94b44ed
>--- /dev/null
>+++ b/unpin-html5lib-requirement.patch
>@@ -0,0 +1,34 @@
>+From 425148eb3be2d4ab6fb6757c9536ce869fab6026 Mon Sep 17 00:00:00 2001
>+From: Dan Scott <dan@coffeecode.net>
>+Date: Wed, 26 Feb 2014 13:51:07 -0500
>+Subject: [PATCH] Unpin html5lib 0.95 requirement
>+
>+Due to an html5lib regression (described in the thread at
>+https://groups.google.com/d/msg/rdflib-dev/ZcAgKzhS3vI/3mxIJz4rwWUJ) , we
>+opened https://github.com/html5lib/html5lib-python/issues/67 on June 17th, 2013
>+and pinned html5lib to 0.95 in setup.py. The bug was fixed and a new release of
>+html5lib (1.0b3) was cut on July 24, 2013. The current version of html5lib is
>+0.999; let's unpin that html5lib requirement.
>+
>+Signed-off-by: Dan Scott <dan@coffeecode.net>
>+---
>+ setup.py | 3 +--
>+ 1 file changed, 1 insertion(+), 2 deletions(-)
>+
>+diff --git a/setup.py b/setup.py
>+index e455d20..c00a978 100644
>+--- a/setup.py
>++++ b/setup.py
>+@@ -61,8 +61,7 @@ else:
>+             kwargs['install_requires'].append('simplejson')
>+             kwargs['install_requires'].append('html5lib==0.95')
>+         else:
>+-            # 1.0b1 is broken - revert to no version when fixed
>+-            kwargs['install_requires'].append('html5lib==0.95') 
>++            kwargs['install_requires'].append('html5lib') 
>+ 
>+     except ImportError:
>+         from distutils.core import setup
>+-- 
>+1.8.5.3
>+
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1070074: 868120 | 868133 | 868157 | 868159 | 869736 | 869936 | 869937 | 869938 | 869939 | 870443