Package: gavodachs Version: 2.7+dfsg-1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for gavodachs (versioned as 2.7+dfsg-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. SR
diff -Nru gavodachs-2.7+dfsg/debian/changelog gavodachs-2.7+dfsg/debian/changelog --- gavodachs-2.7+dfsg/debian/changelog 2022-11-28 05:56:12.000000000 -0400 +++ gavodachs-2.7+dfsg/debian/changelog 2023-01-08 15:52:41.000000000 -0400 @@ -1,3 +1,11 @@ +gavodachs (2.7+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Patch: Support Python 3.11. (Closes: #1027398) + * Patch: Support numpy 1.24 (Closes: #1027213) + + -- Stefano Rivera <stefa...@debian.org> Sun, 08 Jan 2023 15:52:41 -0400 + gavodachs (2.7+dfsg-1) unstable; urgency=medium * New upstream version 2.7+dfsg diff -Nru gavodachs-2.7+dfsg/debian/patches/numpy-1.24.patch gavodachs-2.7+dfsg/debian/patches/numpy-1.24.patch --- gavodachs-2.7+dfsg/debian/patches/numpy-1.24.patch 1969-12-31 20:00:00.000000000 -0400 +++ gavodachs-2.7+dfsg/debian/patches/numpy-1.24.patch 2023-01-08 15:52:41.000000000 -0400 @@ -0,0 +1,68 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sun, 8 Jan 2023 15:29:25 -0400 +Subject: Replace numpy types with builtin types where appropriate + +Supports Numpy > 1.24 + +Bug-Debian: https://bugs.debian.org/1027213 +--- + gavo/base/typesystems.py | 10 +++++----- + gavo/formats/fitstable.py | 2 +- + gavo/votable/simple.py | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/gavo/base/typesystems.py b/gavo/base/typesystems.py +index 0e4223e..33b4827 100644 +--- a/gavo/base/typesystems.py ++++ b/gavo/base/typesystems.py +@@ -139,11 +139,11 @@ class ToNumpyConverter(FromSQLConverter): + "integer": numpy.int32, + "bigint": numpy.int64, + "real": numpy.float32, +- "boolean": numpy.bool, ++ "boolean": bool, + "double precision": numpy.float64, +- "text": numpy.str, +- "unicode": numpy.str, +- "char": numpy.str, ++ "text": str, ++ "unicode": str, ++ "char": str, + "date": numpy.float32, + "timestamp": numpy.float64, + "time": numpy.float32, +@@ -151,7 +151,7 @@ class ToNumpyConverter(FromSQLConverter): + + def mapComplex(self, type, length): + if type in self._charTypes: +- return numpy.str ++ return str + + + class ToPythonBase(FromSQLConverter): +diff --git a/gavo/formats/fitstable.py b/gavo/formats/fitstable.py +index b30c740..0de05bb 100644 +--- a/gavo/formats/fitstable.py ++++ b/gavo/formats/fitstable.py +@@ -128,7 +128,7 @@ def _makeValueArray(values, colInd, colDesc): + # That's a variable-length array that we'll fill from a + # numpy object array + return typecode, numpy.array([list(v[colInd]) for v in values], +- dtype=numpy.object) ++ dtype=object) + + elif length>1: + # numpy 1:1.12.1-3 and pyfits from astropy 1.3-8 apparently +diff --git a/gavo/votable/simple.py b/gavo/votable/simple.py +index 1ff2ac7..acaf6fc 100644 +--- a/gavo/votable/simple.py ++++ b/gavo/votable/simple.py +@@ -24,7 +24,7 @@ try: + "long": numpy.int64, + "float": numpy.float32, + "double": numpy.float64, +- "boolean": numpy.bool, ++ "boolean": bool, + "char": numpy.str_, + "floatComplex": numpy.complex64, + "doubleComplex": numpy.complex128, diff -Nru gavodachs-2.7+dfsg/debian/patches/python3.11.patch gavodachs-2.7+dfsg/debian/patches/python3.11.patch --- gavodachs-2.7+dfsg/debian/patches/python3.11.patch 1969-12-31 20:00:00.000000000 -0400 +++ gavodachs-2.7+dfsg/debian/patches/python3.11.patch 2023-01-08 15:52:41.000000000 -0400 @@ -0,0 +1,35 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sun, 8 Jan 2023 15:18:21 -0400 +Subject: Don't repeat global inline flags in the middle of a regex + +[bpo-47066]: As of Python 3.11, global inline flags (e.g. (?i)) can now +only be used at the start of regular expressions. Using them elsewhere +has been deprecated since Python 3.6. + +Bug-Debian: https://bugs.debian.org/1027398 +--- + gavo/stc/tapstc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gavo/stc/tapstc.py b/gavo/stc/tapstc.py +index 0e3c206..e744508 100644 +--- a/gavo/stc/tapstc.py ++++ b/gavo/stc/tapstc.py +@@ -225,7 +225,7 @@ def getSimpleSTCSParser(): + frameRE = _makeRE(TAP_SYSTEMS) + refposRE = _makeRE(TAP_REFPOS) + flavorRE = _makeRE(TAP_FLAVORS) +- systemRE = (r"(?i)\s*" ++ systemRE = (r"\s*" + r"(?P<frame>%s)?\s*" + r"(?P<refpos>%s)?\s*" + r"(?P<flavor>%s)?\s*")%( +@@ -238,7 +238,7 @@ def getSimpleSTCSParser(): + +coordsRE) + simpleStatement.setName("STC-S geometry") + simpleStatement.addParseAction(lambda s,p,t: _makePgSphereInstance(t)) +- system = Regex(systemRE) ++ system = Regex("(?i)" + systemRE) + system.setName("STC-S system spec") + region = Forward() + notExpr = CaselessKeyword("NOT") + Suppress('(') + region + Suppress(')') diff -Nru gavodachs-2.7+dfsg/debian/patches/series gavodachs-2.7+dfsg/debian/patches/series --- gavodachs-2.7+dfsg/debian/patches/series 2022-02-23 16:08:41.000000000 -0400 +++ gavodachs-2.7+dfsg/debian/patches/series 2023-01-08 15:52:41.000000000 -0400 @@ -0,0 +1,2 @@ +python3.11.patch +numpy-1.24.patch
