[med-svn] [Git][med-team/scoary][master] 3 commits: syntax-warnings.patch: fix SyntaxWarnings.

[Étienne Mollier (@emollier)]

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


Commits:
e95d824b by Étienne Mollier at 2024-12-02T19:57:21+01:00
syntax-warnings.patch: fix SyntaxWarnings.

Closes: #1087074

- - - - -
4e5323fb by Étienne Mollier at 2024-12-02T19:59:31+01:00
remove_six.patch: provide a minimal dep3 header.

- - - - -
f0424518 by Étienne Mollier at 2024-12-02T20:06:41+01:00
d/changelog: ready for upload to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/remove_six.patch
- debian/patches/series
- + debian/patches/syntax-warnings.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+scoary (1.6.16-10) unstable; urgency=medium
+
+  * syntax-warnings.patch: fix SyntaxWarnings. (Closes: #1087074)
+  * remove_six.patch: provide a minimal dep3 header.
+
+ -- Étienne Mollier <emollier at debian.org>  Mon, 02 Dec 2024 20:04:01 +0100
+
 scoary (1.6.16-9) unstable; urgency=medium
 
   * rm-pkg_resources.patch: new: reimplement uses of pkg_resources.


=====================================
debian/patches/remove_six.patch
=====================================
@@ -1,3 +1,5 @@
+Description: ete3 does not need six anymore for a long time
+Author: Alexandre Detiste <tchet at debian.org>
 Forwarded: https://github.com/AdmiralenOla/Scoary/pull/111
 
 --- a/scoary/nwkhandler.py


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ python3.11.patch
 scipy-1.12.0.patch
 remove_six.patch
 rm-pkg_resources.patch
+syntax-warnings.patch


=====================================
debian/patches/syntax-warnings.patch
=====================================
@@ -0,0 +1,36 @@
+Description: vcf2scoary.py: fix SyntaxWarnings.
+ With contemporary Python versions like 3.13, Scoary emits the following warnings:
+ .
+   /usr/lib/python3/dist-packages/scoary/vcf2scoary.py:94: SyntaxWarning: "is not" with 'str' literal. Did you mean "!="?
+     if args.types is not "ALL":
+   /usr/lib/python3/dist-packages/scoary/vcf2scoary.py:172: SyntaxWarning: "is not" with 'str' literal. Did you mean "!="?
+     if args.types is not "ALL":
+ .
+ Applying the hint resolves the issue.
+
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087074
+Forwarded: https://github.com/AdmiralenOla/Scoary/pull/113
+Last-Update: 2024-12-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- scoary.orig/scoary/vcf2scoary.py
++++ scoary/scoary/vcf2scoary.py
+@@ -91,7 +91,7 @@
+         help='The VCF file to convert to Roary/Scoary format')
+ 
+     args = parser.parse_args()
+-    if args.types is not "ALL":
++    if args.types != "ALL":
+         args.types = args.types.split(",")
+ 
+     if os.path.isfile(args.out) and not args.force:
+@@ -169,7 +169,7 @@
+                 print("Reached the end of the file")
+                 sys.exit(0)
+             # Check if line is allowed:
+-            if args.types is not "ALL":
++            if args.types != "ALL":
+                 vartype = re.search(r'TYPE=(\w+)',line[7]).group(1)
+                 if vartype not in args.types:
+                     continue



View it on GitLab: https://salsa.debian.org/med-team/scoary/-/compare/17f8588573d2ff6ee1caf0223d4714c5ecea81aa...f0424518ebe86b8e789074c8200149469360bd97

-- 
View it on GitLab: https://salsa.debian.org/med-team/scoary/-/compare/17f8588573d2ff6ee1caf0223d4714c5ecea81aa...f0424518ebe86b8e789074c8200149469360bd97
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/20241202/51d01399/attachment-0001.htm>