diff options
| author | Andreas Tille <tille@debian.org> | 2023-02-03 21:49:03 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2023-02-04 04:37:40 +0000 |
| commit | 6aa102e808cf28ad3191fc51fd90912a122b54c9 (patch) | |
| tree | 93b59d5cdefc1a8e71712a59debf04ef9a2a9e42 | |
| parent | 03b8bb85566c0337448206610069ccd0c251efa8 (diff) | |
| parent | 96d6ccbb7c0cd601d8e74c997d597fd81ead3e52 (diff) | |
0.3-4 (patches applied)applied/0.3-4applied/ubuntu/questing-develapplied/ubuntu/questingapplied/ubuntu/plucky-develapplied/ubuntu/pluckyapplied/ubuntu/oracular-develapplied/ubuntu/oracularapplied/ubuntu/noble-develapplied/ubuntu/nobleapplied/ubuntu/mantic-develapplied/ubuntu/manticapplied/ubuntu/lunar-proposedapplied/ubuntu/lunar-develapplied/ubuntu/lunarapplied/debian/sidapplied/debian/bookworm
Imported using git-ubuntu import.
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/patches/numpy-1.24.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/syntax.patch | 14 | ||||
| -rw-r--r-- | debian/watch | 3 | ||||
| -rw-r--r-- | igor/binarywave.py | 2 | ||||
| -rw-r--r-- | igor/util.py | 2 |
9 files changed, 62 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 6ecb343..205b00c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +python-igor (0.3-4) unstable; urgency=medium + + * Team upload + + [ Bas Couwenberg ] + * Non-maintainer upload. + * Add patch to fix FTBFS with Numpy 1.24. + (closes: #1028825) + * Add patch to fix SyntaxWarning. + + [ Andreas Tille ] + * Add watch file + * Standards-Version: 4.6.2 (routine-update) + * debhelper-compat 13 (routine-update) + * Testsuite: autopkgtest-pkg-python (routine-update) + * Remove trailing whitespace in debian/control (routine-update) + * Rules-Requires-Root: no (routine-update) + + -- Andreas Tille <tille@debian.org> Fri, 03 Feb 2023 21:49:03 +0100 + python-igor (0.3-3) unstable; urgency=medium * Source only upload for migration to testing diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 915c3b6..b8f9ef6 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,18 @@ Source: python-igor Section: python +Testsuite: autopkgtest-pkg-python Priority: optional Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org> -Uploaders: Sebastien Delafond <seb@debian.org> -Build-Depends: - debhelper (>= 12), +Uploaders: Sebastien Delafond <seb@debian.org>, Picca Frédéric-Emmanuel <picca@debian.org> +Build-Depends: + debhelper-compat (= 13), dh-python, python3-all, python3-numpy, python3-setuptools -Standards-Version: 4.5.0 +Standards-Version: 4.6.2 Homepage: http://git.tremily.us/?p=igor +Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/science-team/igor Vcs-Git: https://salsa.debian.org/science-team/igor.git diff --git a/debian/patches/numpy-1.24.patch b/debian/patches/numpy-1.24.patch new file mode 100644 index 0000000..68d6708 --- /dev/null +++ b/debian/patches/numpy-1.24.patch @@ -0,0 +1,15 @@ +Description: Fix FTBFS with Numpy 1.24. + https://numpy.org/devdocs/release/1.20.0-notes.html#using-the-aliases-of-builtin-types-like-np-int-is-deprecated +Author: Bas Couwenberg <sebastic@debian.org> + +--- a/igor/binarywave.py ++++ b/igor/binarywave.py +@@ -107,7 +107,7 @@ class NullStaticStringField (StaticStrin + # From IgorMath.h + TYPE_TABLE = { # (key: integer flag, value: numpy dtype) + 0:None, # Text wave, not handled in ReadWave.c +- 1:_numpy.complex, # NT_CMPLX, makes number complex. ++ 1:_numpy.cdouble, # NT_CMPLX, makes number complex. + 2:_numpy.float32, # NT_FP32, 32 bit fp numbers. + 3:_numpy.complex64, + 4:_numpy.float64, # NT_FP64, 64 bit fp numbers. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4031048 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +numpy-1.24.patch +syntax.patch diff --git a/debian/patches/syntax.patch b/debian/patches/syntax.patch new file mode 100644 index 0000000..68e681d --- /dev/null +++ b/debian/patches/syntax.patch @@ -0,0 +1,14 @@ +Description: Fix 'SyntaxWarning: "is" with a literal. Did you mean "=="?'. +Author: Bas Couwenberg <sebastic@debian.org> + +--- a/igor/util.py ++++ b/igor/util.py +@@ -51,7 +51,7 @@ def hex_bytes(buffer, spaces=None): + hex_bytes = ['{:02x}'.format(_ord(x)) for x in buffer] + if spaces is None: + return ''.join(hex_bytes) +- elif spaces is 1: ++ elif spaces == 1: + return ' '.join(hex_bytes) + for i in range(len(hex_bytes)//spaces): + hex_bytes.insert((spaces+1)*(i+1)-1, ' ') diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..31cdea8 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 + +https://pypi.python.org/simple/igor .*/igor-@ANY_VERSION@@ARCHIVE_EXT@#sha256=.* diff --git a/igor/binarywave.py b/igor/binarywave.py index 6d87d14..a53db41 100644 --- a/igor/binarywave.py +++ b/igor/binarywave.py @@ -107,7 +107,7 @@ class NullStaticStringField (StaticStringField): # From IgorMath.h TYPE_TABLE = { # (key: integer flag, value: numpy dtype) 0:None, # Text wave, not handled in ReadWave.c - 1:_numpy.complex, # NT_CMPLX, makes number complex. + 1:_numpy.cdouble, # NT_CMPLX, makes number complex. 2:_numpy.float32, # NT_FP32, 32 bit fp numbers. 3:_numpy.complex64, 4:_numpy.float64, # NT_FP64, 64 bit fp numbers. diff --git a/igor/util.py b/igor/util.py index ecc783a..5a70db0 100644 --- a/igor/util.py +++ b/igor/util.py @@ -51,7 +51,7 @@ def hex_bytes(buffer, spaces=None): hex_bytes = ['{:02x}'.format(_ord(x)) for x in buffer] if spaces is None: return ''.join(hex_bytes) - elif spaces is 1: + elif spaces == 1: return ' '.join(hex_bytes) for i in range(len(hex_bytes)//spaces): hex_bytes.insert((spaces+1)*(i+1)-1, ' ') |