[med-svn] [Git][med-team/kleborate][master] 2 commits: use_debian_installed_kaptive.patch: update.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / kleborate


Commits:
49b1ded8 by Étienne Mollier at 2024-01-13T17:46:06+01:00
use_debian_installed_kaptive.patch: update.

Remove another reference to the kaptive package in setup.py, in an
attempt to fix build failures in particular contexts such as Salsa CI.

- - - - -
86a1a568 by Étienne Mollier at 2024-01-13T17:47:20+01:00
update changelog.

- - - - -


2 changed files:

- debian/changelog
- debian/patches/use_debian_installed_kaptive.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+kleborate (2.4.1-2) UNRELEASED; urgency=medium
+
+  * use_debian_installed_kaptive.patch: update.
+    Remove another reference to the kaptive package in setup.py, in an
+    attempt to fix build failures in particular contexts such as Salsa CI.
+
+ -- Étienne Mollier <emollier at debian.org>  Sat, 13 Jan 2024 17:47:10 +0100
+
 kleborate (2.4.1-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/use_debian_installed_kaptive.patch
=====================================
@@ -3,9 +3,9 @@ Last-Update: Tue, 24 Sep 2019 12:36:03 +0200
 Description: Make sure Debian packaged kaptive will be found
 Forwarded: not-needed
 
---- a/kleborate/kaptive.py
-+++ b/kleborate/kaptive.py
-@@ -20,13 +20,13 @@ import tempfile
+--- kleborate.orig/kleborate/kaptive.py
++++ kleborate/kleborate/kaptive.py
+@@ -20,13 +20,13 @@
  
  def get_kaptive_paths():
      this_file = os.path.realpath(__file__)
@@ -21,3 +21,14 @@ Forwarded: not-needed
      kaptive_k_db = os.path.join(db_dir, 'Klebsiella_k_locus_primary_reference.gbk')
      if not os.path.isfile(kaptive_k_db):
          sys.exit('Error: could not find Klebsiella_k_locus_primary_reference.gbk')
+--- kleborate.orig/setup.py
++++ kleborate/setup.py
+@@ -121,7 +121,7 @@
+       url='https://github.com/katholt/Kleborate',
+       author='Kathryn Holt',
+       author_email='',
+-      packages=['kleborate', 'kaptive'],
++      packages=['kleborate'],
+       install_requires=['biopython'],
+       entry_points={'console_scripts': ['kleborate = kleborate.__main__:main']},
+       include_package_data=True,



View it on GitLab: https://salsa.debian.org/med-team/kleborate/-/compare/86cfad84b4fb7f85377fffb227a8edb2419e78ab...86a1a568dc7861cab8b88b9d35ce3e3a7208f562

-- 
View it on GitLab: https://salsa.debian.org/med-team/kleborate/-/compare/86cfad84b4fb7f85377fffb227a8edb2419e78ab...86a1a568dc7861cab8b88b9d35ce3e3a7208f562
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/20240113/48dadbbb/attachment-0001.htm>