[med-svn] [Git][med-team/khmer][master] 3 commits: Refresh d/p/python3.12-support.patch

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / khmer


Commits:
89f1e6af by Olivier Gayot at 2023-11-29T21:51:07+01:00
Refresh d/p/python3.12-support.patch

The patch d/p/python3.12-support.patch was modified in Ubuntu in a
second upload and somehow the change was lost when forwarding to Debian.

Signed-off-by: Olivier Gayot <olivier.gayot at canonical.com>

- - - - -
41ee1538 by Olivier Gayot at 2023-11-29T21:56:34+01:00
Drop trailing white-space from d/p/close-opened-files.patch

Signed-off-by: Olivier Gayot <olivier.gayot at canonical.com>

- - - - -
3e1a13c6 by Olivier Gayot at 2023-11-29T22:12:46+01:00
Prepare changelog for 3.0.0~a3+dfsg-7

Signed-off-by: Olivier Gayot <olivier.gayot at canonical.com>

- - - - -


3 changed files:

- debian/changelog
- debian/patches/close-opened-files.patch
- debian/patches/python3.12-support.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+khmer (3.0.0~a3+dfsg-7) UNRELEASED; urgency=medium
+
+  * Refresh d/p/python3.12-support.patch with missing Ubuntu changes.
+
+ -- Olivier Gayot <olivier.gayot at canonical.com>  Wed, 29 Nov 2023 21:57:29 +0100
+
 khmer (3.0.0~a3+dfsg-6) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/close-opened-files.patch
=====================================
@@ -1,4 +1,4 @@
-Description: ensure that Python scripts close files that they open for writing 
+Description: ensure that Python scripts close files that they open for writing
  Python scripts under scripts/ in the source tree do not consistently close
  files that they open for writing. While some of the scripts use context
  managers, most of them do not (or do so inconsistently).


=====================================
debian/patches/python3.12-support.patch
=====================================
@@ -8,6 +8,7 @@ Description: Add support for Python 3.12
  The imp module has also been dropped, but a similar behavior can be achieved
  using importlib.
 Author: Olivier Gayot <olivier.gayot at canonical.com>
+Author: Simon Quigley <tsimonq2 at ubuntu.com>
 Bug-Ubuntu: https://launchpad.net/bugs/2044383
 Bug-Debian: https://bugs.debian.org/1055687
 Forwarded: https://github.com/dib-lab/khmer/pull/1922
@@ -17,16 +18,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: khmer-3.0.0~a3+dfsg/versioneer.py
 ===================================================================
 --- khmer-3.0.0~a3+dfsg.orig/versioneer.py	2019-03-13 14:42:12.000000000 +0100
-+++ khmer-3.0.0~a3+dfsg/versioneer.py	2023-11-23 15:19:50.025827413 +0100
-@@ -339,7 +339,7 @@
++++ khmer-3.0.0~a3+dfsg/versioneer.py	2023-11-26 15:33:13.650983273 +0100
+@@ -339,9 +339,9 @@
      # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
      # the top of versioneer.py for instructions on writing your setup.cfg .
      setup_cfg = os.path.join(root, "setup.cfg")
 -    parser = configparser.SafeConfigParser()
 +    parser = configparser.ConfigParser()
      with open(setup_cfg, "r") as f:
-         parser.readfp(f)
+-        parser.readfp(f)
++        parser.read_file(f)
      VCS = parser.get("versioneer", "VCS")  # mandatory
+ 
+     def get(parser, name):
 Index: khmer-3.0.0~a3+dfsg/tests/test_sandbox_scripts.py
 ===================================================================
 --- khmer-3.0.0~a3+dfsg.orig/tests/test_sandbox_scripts.py	2023-11-26 15:33:13.654983243 +0100



View it on GitLab: https://salsa.debian.org/med-team/khmer/-/compare/62e0ab3a816f0e0940fad6b5ec70ec365805ace7...3e1a13c65ae84f92e91b0c9babce5e6f79acc51a

-- 
View it on GitLab: https://salsa.debian.org/med-team/khmer/-/compare/62e0ab3a816f0e0940fad6b5ec70ec365805ace7...3e1a13c65ae84f92e91b0c9babce5e6f79acc51a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231130/b251c5b1/attachment-0001.htm>