[med-svn] [python-pbcore] 04/06: Don't raise exception if pyxb version does not exactly match

Afif Elghraoui afif at moszumanska.debian.org
Sun Oct 9 18:38:06 UTC 2016


This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch master
in repository python-pbcore.

commit b51022dd34e38dd3b16daf5da2b1b69636002604
Author: Afif Elghraoui <afif at debian.org>
Date:   Sun Oct 9 11:08:48 2016 -0700

    Don't raise exception if pyxb version does not exactly match
    
    Closes: #839346
---
 debian/patches/ignore-pyxb.patch | 88 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 89 insertions(+)

diff --git a/debian/patches/ignore-pyxb.patch b/debian/patches/ignore-pyxb.patch
new file mode 100644
index 0000000..c7f1346
--- /dev/null
+++ b/debian/patches/ignore-pyxb.patch
@@ -0,0 +1,88 @@
+Description: Ignore hard-coded pyxb version check
+ Upstream does not really care to keep up with pyxb versions
+ (see https://github.com/PacificBiosciences/pbcore/pull/105/commits/2b2782e68a0117e0844279a001a010376e18b644)
+ Dataset is not an interesting part of pbcore either. Disabling the hardcoded
+ version check, the test suite still passes.
+Author: Afif Elghraoui <afif at debian.org>
+Forwarded: not-needed
+Last-Update: 2016-10-09
+--- python-pbcore.orig/pbcore/io/dataset/DataSetXsd.py
++++ python-pbcore/pbcore/io/dataset/DataSetXsd.py
+@@ -18,10 +18,10 @@
+ _GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:8749368c-9df1-11e5-86b0-001a4acb6b14')
+ 
+ # Version of PyXB used to generate the bindings
+-_PyXBVersion = '1.2.4'
++#_PyXBVersion = '1.2.4'
+ # Generated bindings are not compatible across PyXB versions
+-if pyxb.__version__ != _PyXBVersion:
+-    raise pyxb.PyXBVersionError(_PyXBVersion)
++#if pyxb.__version__ != _PyXBVersion:
++#    raise pyxb.PyXBVersionError(_PyXBVersion)
+ 
+ # Import bindings for namespaces imported into schema
+ import pyxb.binding.datatypes
+--- python-pbcore.orig/pbcore/io/dataset/_pbbase.py
++++ python-pbcore/pbcore/io/dataset/_pbbase.py
+@@ -18,10 +18,10 @@
+ _GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:8749368c-9df1-11e5-86b0-001a4acb6b14')
+ 
+ # Version of PyXB used to generate the bindings
+-_PyXBVersion = '1.2.4'
++#_PyXBVersion = '1.2.4'
+ # Generated bindings are not compatible across PyXB versions
+-if pyxb.__version__ != _PyXBVersion:
+-    raise pyxb.PyXBVersionError(_PyXBVersion)
++#if pyxb.__version__ != _PyXBVersion:
++#    raise pyxb.PyXBVersionError(_PyXBVersion)
+ 
+ # Import bindings for namespaces imported into schema
+ import pyxb.binding.datatypes
+--- python-pbcore.orig/pbcore/io/dataset/_pbmeta.py
++++ python-pbcore/pbcore/io/dataset/_pbmeta.py
+@@ -18,10 +18,10 @@
+ _GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:8749368c-9df1-11e5-86b0-001a4acb6b14')
+ 
+ # Version of PyXB used to generate the bindings
+-_PyXBVersion = '1.2.4'
++#_PyXBVersion = '1.2.4'
+ # Generated bindings are not compatible across PyXB versions
+-if pyxb.__version__ != _PyXBVersion:
+-    raise pyxb.PyXBVersionError(_PyXBVersion)
++#if pyxb.__version__ != _PyXBVersion:
++#    raise pyxb.PyXBVersionError(_PyXBVersion)
+ 
+ # Import bindings for namespaces imported into schema
+ import pyxb.binding.datatypes
+--- python-pbcore.orig/pbcore/io/dataset/_pbrk.py
++++ python-pbcore/pbcore/io/dataset/_pbrk.py
+@@ -18,10 +18,10 @@
+ _GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:8749368c-9df1-11e5-86b0-001a4acb6b14')
+ 
+ # Version of PyXB used to generate the bindings
+-_PyXBVersion = '1.2.4'
++#_PyXBVersion = '1.2.4'
+ # Generated bindings are not compatible across PyXB versions
+-if pyxb.__version__ != _PyXBVersion:
+-    raise pyxb.PyXBVersionError(_PyXBVersion)
++#if pyxb.__version__ != _PyXBVersion:
++#    raise pyxb.PyXBVersionError(_PyXBVersion)
+ 
+ # Import bindings for namespaces imported into schema
+ import pyxb.binding.datatypes
+--- python-pbcore.orig/pbcore/io/dataset/_pbsample.py
++++ python-pbcore/pbcore/io/dataset/_pbsample.py
+@@ -18,10 +18,10 @@
+ _GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:8749368c-9df1-11e5-86b0-001a4acb6b14')
+ 
+ # Version of PyXB used to generate the bindings
+-_PyXBVersion = '1.2.4'
++#_PyXBVersion = '1.2.4'
+ # Generated bindings are not compatible across PyXB versions
+-if pyxb.__version__ != _PyXBVersion:
+-    raise pyxb.PyXBVersionError(_PyXBVersion)
++#if pyxb.__version__ != _PyXBVersion:
++#    raise pyxb.PyXBVersionError(_PyXBVersion)
+ 
+ # Import bindings for namespaces imported into schema
+ import pyxb.binding.datatypes
diff --git a/debian/patches/series b/debian/patches/series
index 8b6f192..00dca95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ doc-theme.patch
 enable-build-time-testing.patch
 remove-unnecessary-cython-dep.patch
 deprecate-dataset.patch
+ignore-pyxb.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pbcore.git



More information about the debian-med-commit mailing list