[python-bitstring] 02/08: Update patch queue: - Drop 0001-fix-sphinxdoc-build.patch, fixed upstream. - Refresh fix-testsuite-discovery.patch.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Mar 23 12:02:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository python-bitstring.
commit 75726e37a9075e5334f265aeadd7fdb63642164c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Mar 23 10:36:14 2016 +0000
Update patch queue:
- Drop 0001-fix-sphinxdoc-build.patch, fixed upstream.
- Refresh fix-testsuite-discovery.patch.
---
debian/patches/0001-fix-sphinxdoc-build.patch | 26 --------------------------
debian/patches/fix-testsuite-discovery.patch | 26 +++++++++++++-------------
debian/patches/series | 1 -
3 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/debian/patches/0001-fix-sphinxdoc-build.patch b/debian/patches/0001-fix-sphinxdoc-build.patch
deleted file mode 100644
index 25b9901..0000000
--- a/debian/patches/0001-fix-sphinxdoc-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Build documentation with default sphinx theme
-Forwarded: not-needed
-Origin: vendor
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Last-Update: 2015-04-17
-
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -22,7 +22,7 @@
-
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinxjp.themecore']
-+extensions = ['sphinx.ext.autodoc',]
-
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
-@@ -91,7 +91,7 @@
-
- # The theme to use for HTML and HTML Help pages. Major themes that come with
- # Sphinx are currently 'default' and 'sphinxdoc'.
--html_theme = 'bizstyle'
-+html_theme = 'default'
-
- # Theme options are theme-specific and customize the look and feel of a theme
- # further. For a list of options available for each theme, see the
diff --git a/debian/patches/fix-testsuite-discovery.patch b/debian/patches/fix-testsuite-discovery.patch
index 0afe671..95b07a2 100644
--- a/debian/patches/fix-testsuite-discovery.patch
+++ b/debian/patches/fix-testsuite-discovery.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/test/test_bits.py
+++ b/test/test_bits.py
-@@ -210,10 +210,10 @@
+@@ -214,10 +214,10 @@
class FileBased(unittest.TestCase):
def setUp(self):
@@ -21,7 +21,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
def testCreationWithOffset(self):
self.assertEqual(self.a, '0x0123456789abcdef')
-@@ -239,7 +239,7 @@
+@@ -243,7 +243,7 @@
class Mmap(unittest.TestCase):
def setUp(self):
@@ -207,7 +207,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
self.assertEqual('0x' + s[0:bitstring.MAX_CHARS * 4].hex + '...', s.__str__())
self.assertEqual(BitStream().__str__(), '')
s = BitStream('0b11010')
-@@ -2279,40 +2279,40 @@
+@@ -2280,40 +2280,40 @@
def testToFile(self):
a = BitStream('0x0000ff')[:17]
@@ -258,7 +258,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
def testTokenParser(self):
tp = bitstring.tokenparser
-@@ -2332,7 +2332,7 @@
+@@ -2333,7 +2333,7 @@
self.assertEqual(tp('2*bits:6'), (False, [('bits', 6, None), ('bits', 6, None)]))
def testAutoFromFileObject(self):
@@ -267,7 +267,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
s = ConstBitStream(f, offset=32, length=12)
self.assertEqual(s.uint, 352)
t = ConstBitStream('0xf') + f
-@@ -2342,13 +2342,13 @@
+@@ -2343,13 +2343,13 @@
t2.prepend(s2)
self.assertTrue(t2.startswith('0x000001b3'))
self.assertTrue(t2.endswith('0xc'))
@@ -283,7 +283,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
s = BitStream(f)
t = BitStream(s)
s.prepend('0b1')
-@@ -2866,10 +2866,10 @@
+@@ -2867,10 +2867,10 @@
self.assertRaises(IndexError, a.set, 1, [-11])
def testFileBasedSetUnset(self):
@@ -296,7 +296,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
a.set(False, (28, 29, 30, 31))
self.assertTrue(a.startswith('0x000001b0'))
-@@ -2947,7 +2947,7 @@
+@@ -2948,7 +2948,7 @@
a = BitStream('0b0101010101000')
a &= '0b1111110000000'
self.assertEqual(a, '0b0101010000000')
@@ -305,7 +305,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
s &= '0xff00ff'
self.assertEqual(s, '0xcc0004')
-@@ -2972,15 +2972,15 @@
+@@ -2973,15 +2973,15 @@
self.assertFalse(a.all(True, [0]))
def testFileBasedAll(self):
@@ -325,7 +325,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
self.assertTrue(a.any(False, (0, 1, 2, 3, 4)))
def testAny(self):
-@@ -3165,7 +3165,7 @@
+@@ -3166,7 +3166,7 @@
self.assertEqual(a, '0b1')
def testRolFromFile(self):
@@ -334,7 +334,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
l = a.len
a.rol(1)
self.assertTrue(a.startswith('0x000003'))
-@@ -3173,7 +3173,7 @@
+@@ -3174,7 +3174,7 @@
self.assertTrue(a.endswith('0x0036e'))
def testRorFromFile(self):
@@ -343,7 +343,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
l = a.len
a.ror(1)
self.assertTrue(a.startswith('0x800000'))
-@@ -3609,7 +3609,7 @@
+@@ -3610,7 +3610,7 @@
self.assertRaises(TypeError, s.byteswap, 5.4)
def testByteSwapFromFile(self):
@@ -352,7 +352,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
swaps = s.byteswap('2bh')
self.assertEqual(s, '0x0123674589abefcd')
self.assertEqual(swaps, 2)
-@@ -3812,16 +3812,16 @@
+@@ -3813,16 +3813,16 @@
class FileReadingStrategy(unittest.TestCase):
def testBitStreamIsAlwaysRead(self):
@@ -373,7 +373,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
b = ConstBitStream(f)
self.assertTrue(isinstance(b._datastore._rawarray, bitstring.MmapByteArray))
-@@ -3937,4 +3937,4 @@
+@@ -3938,4 +3938,4 @@
def testBinProperty(self):
b = BitStream(bytes=b'\x00\xaa', offset=8, length=4)
diff --git a/debian/patches/series b/debian/patches/series
index 71b9ff2..52d281f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-fix-sphinxdoc-build.patch
fix-testsuite-discovery.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-bitstring.git
More information about the debian-science-commits
mailing list