[med-svn] [Git][med-team/flye][master] 3 commits: rewrite d/rules with shorter syntax
Alexandre Detiste (@detiste-guest)
gitlab at salsa.debian.org
Sun Nov 23 18:54:20 GMT 2025
Alexandre Detiste pushed to branch master at Debian Med / flye
Commits:
8f89fab4 by Alexandre Detiste at 2025-11-23T19:45:14+01:00
rewrite d/rules with shorter syntax
- - - - -
7de7d649 by Alexandre Detiste at 2025-11-23T19:52:45+01:00
trim-out useless usage of six
- - - - -
54ee6e5e by Alexandre Detiste at 2025-11-23T19:52:45+01:00
drop "Rules-Requires-Root: no": it is now the default
- - - - -
3 changed files:
- debian/control
- debian/patches/python3.12.patch
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -16,7 +16,6 @@ Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/flye
Vcs-Git: https://salsa.debian.org/med-team/flye.git
Homepage: https://github.com/fenderglass/Flye
-Rules-Requires-Root: no
Package: flye
Architecture: any
=====================================
debian/patches/python3.12.patch
=====================================
@@ -37,7 +37,7 @@ Last-Update: 2024-02-02
#import flye.trestle.graph_resolver as tres_graph
from flye.repeat_graph.repeat_graph import RepeatGraph
-from flye.six.moves import range
-+from six.moves import range
++
if sys.version_info[0] == 2:
raise Exception("Python 2 is unsupported")
@@ -50,7 +50,7 @@ Last-Update: 2024-02-02
-from flye.six import iteritems
-from flye.six.moves import range
+from six import iteritems
-+from six.moves import range
++
logger = logging.getLogger()
@@ -61,7 +61,7 @@ Last-Update: 2024-02-02
import logging
from bisect import bisect
-from flye.six.moves import range
-+from six.moves import range
++
from collections import defaultdict
from queue import Queue
@@ -70,7 +70,7 @@ Last-Update: 2024-02-02
from flye.utils.sam_parser import SynchronizedSamReader, SynchonizedChunkManager
from flye.utils.utils import process_in_parallel, get_median
-from flye.six.moves import zip
-+from six.moves import zip
++
logger = logging.getLogger()
@@ -82,7 +82,7 @@ Last-Update: 2024-02-02
from collections import defaultdict
-from flye.six.moves import range
-from flye.six import itervalues
-+from six.moves import range
++
+from six import itervalues
import multiprocessing
@@ -92,7 +92,7 @@ Last-Update: 2024-02-02
import flye.utils.fasta_parser as fp
from flye.utils.utils import process_in_parallel
-from flye.six.moves import zip
-+from six.moves import zip
++
logger = logging.getLogger()
@@ -105,7 +105,7 @@ Last-Update: 2024-02-02
-from flye.six import iteritems
-from flye.six.moves import range
+from six import iteritems
-+from six.moves import range
++
POLISH_BIN = "flye-modules"
@@ -118,7 +118,7 @@ Last-Update: 2024-02-02
-from flye.six import iteritems
-from flye.six.moves import range
+from six import iteritems
-+from six.moves import range
++
logger = logging.getLogger()
@@ -131,7 +131,7 @@ Last-Update: 2024-02-02
-from flye.six import iteritems
-from flye.six.moves import range
+from six import iteritems
-+from six.moves import range
++
logger = logging.getLogger()
@@ -142,7 +142,7 @@ Last-Update: 2024-02-02
#Released under the BSD license (see LICENSE file)
-from flye.six.moves import range
-+from six.moves import range
++
def find_connected_components(graph):
def dfs(start_vertex, connected_components_counter):
@@ -153,7 +153,7 @@ Last-Update: 2024-02-02
import logging
from collections import defaultdict
-from flye.six.moves import range
-+from six.moves import range
++
import multiprocessing
import os.path
@@ -162,7 +162,7 @@ Last-Update: 2024-02-02
from flye.utils.utils import process_in_parallel
import flye.config.py_cfg as config
-from flye.six.moves import zip
-+from six.moves import zip
++
logger = logging.getLogger()
@@ -175,7 +175,7 @@ Last-Update: 2024-02-02
-from flye.six import iteritems
-from flye.six.moves import zip
+from six import iteritems
-+from six.moves import zip
++
logger = logging.getLogger()
@@ -187,8 +187,8 @@ Last-Update: 2024-02-02
import flye.trestle.trestle_config as trestle_config
-from flye.six.moves import range
-from flye.six.moves import zip
-+from six.moves import range
-+from six.moves import zip
++
++
logger = logging.getLogger()
@@ -199,7 +199,7 @@ Last-Update: 2024-02-02
_BYTES = str.encode
-from flye.six.moves import range
-+from six.moves import range
++
logger = logging.getLogger()
@@ -211,7 +211,7 @@ Last-Update: 2024-02-02
-from flye.six.moves import range
-from flye.six import iteritems
-+from six.moves import range
++
+from six import iteritems
import flye.utils.fasta_parser as fp
=====================================
debian/rules
=====================================
@@ -13,8 +13,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
override_dh_installchangelogs:
dh_installchangelogs docs/NEWS.md
-override_dh_auto_clean:
- dh_auto_clean
+execute_after_dh_auto_clean:
find src -name "*.o" -delete
rm -f bin/flye-modules
rm -rf flye.egg-info/
View it on GitLab: https://salsa.debian.org/med-team/flye/-/compare/f27ad9e0e4d904312e6c0bf4c25e61e609728534...54ee6e5e631a619f224d2c42e139627158909ce1
--
View it on GitLab: https://salsa.debian.org/med-team/flye/-/compare/f27ad9e0e4d904312e6c0bf4c25e61e609728534...54ee6e5e631a619f224d2c42e139627158909ce1
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/20251123/7840d86b/attachment-0001.htm>
More information about the debian-med-commit
mailing list