[med-svn] [Git][med-team/nipype][master] python3-looseversion is packaged, use it

[Alexandre Detiste (@detiste-guest)]

Alexandre Detiste pushed to branch master at Debian Med / nipype


Commits:
8b9c7759 by Alexandre Detiste at 2024-08-30T21:10:01+02:00
python3-looseversion is packaged, use it

- - - - -


3 changed files:

- debian/control
- debian/patches/series
- − debian/patches/use_distutils_looseversion.patch


Changes:

=====================================
debian/control
=====================================
@@ -20,6 +20,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-click,
                python3-etelemetry,
                python3-filelock,
+               python3-looseversion,
                python3-matplotlib,
                python3-nbsphinx,
                python3-nibabel,
@@ -49,6 +50,7 @@ Depends: ${python3:Depends},
          python3-click,
          python3-dateutil,
          python3-dipy,
+         python3-looseversion,
          python3-packaging,
          python3-scipy,
          python3-simplejson,


=====================================
debian/patches/series
=====================================
@@ -8,6 +8,4 @@ python3.patch
 sphinx.patch
 fix-transpose.patch
 reproducible-build.patch
-# we_do_not_distribute_looseversion_yet.patch
-use_distutils_looseversion.patch
 fix-privacy-breaches.patch


=====================================
debian/patches/use_distutils_looseversion.patch deleted
=====================================
@@ -1,98 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 26 Jan 2023 09:46:56 +0100
-Description: As long as Python3 module looseversion is not packaged yet use distutils instead
-
---- a/nipype/interfaces/dipy/registration.py
-+++ b/nipype/interfaces/dipy/registration.py
-@@ -1,4 +1,4 @@
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- from ... import logging
- from .base import HAVE_DIPY, dipy_version, dipy_to_nipype_interface, get_dipy_workflows
- 
---- a/nipype/interfaces/dipy/tracks.py
-+++ b/nipype/interfaces/dipy/tracks.py
-@@ -3,7 +3,7 @@
- import os.path as op
- import numpy as np
- import nibabel as nb
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- 
- from ... import logging
- from ..base import TraitedSpec, BaseInterfaceInputSpec, File, isdefined, traits
---- a/nipype/__init__.py
-+++ b/nipype/__init__.py
-@@ -14,7 +14,7 @@ Top-level module API
- import os
- 
- # XXX Deprecate this import
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- 
- from .info import URL as __url__, STATUS as __status__, __version__
- from .utils.config import NipypeConfig
---- a/nipype/interfaces/base/core.py
-+++ b/nipype/interfaces/base/core.py
-@@ -16,7 +16,8 @@ import shlex
- import simplejson as json
- from traits.trait_errors import TraitError
- 
--from ... import config, logging, LooseVersion
-+from ... import config, logging
-+from distutils.version import LooseVersion
- from ...utils.provenance import write_provenance
- from ...utils.misc import str2bool
- from ...utils.filemanip import (
---- a/nipype/interfaces/dipy/preprocess.py
-+++ b/nipype/interfaces/dipy/preprocess.py
-@@ -4,7 +4,7 @@ import os.path as op
- import nibabel as nb
- import numpy as np
- 
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- from ... import logging
- from ..base import traits, TraitedSpec, File, isdefined
- from .base import (
---- a/nipype/interfaces/dipy/reconstruction.py
-+++ b/nipype/interfaces/dipy/reconstruction.py
-@@ -7,7 +7,7 @@ import os.path as op
- 
- import numpy as np
- import nibabel as nb
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- 
- from ... import logging
- from ..base import TraitedSpec, File, traits, isdefined
---- a/nipype/utils/config.py
-+++ b/nipype/utils/config.py
-@@ -14,7 +14,7 @@ import sys
- import errno
- import atexit
- from warnings import warn
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- import configparser
- import numpy as np
- 
---- a/nipype/utils/misc.py
-+++ b/nipype/utils/misc.py
-@@ -9,7 +9,7 @@ import re
- from collections.abc import Iterator
- from warnings import warn
- 
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- 
- import numpy as np
- 
---- a/nipype/interfaces/dipy/stats.py
-+++ b/nipype/interfaces/dipy/stats.py
-@@ -1,4 +1,4 @@
--from looseversion import LooseVersion
-+from distutils.version import LooseVersion
- from ... import logging
- from .base import HAVE_DIPY, dipy_version, dipy_to_nipype_interface, get_dipy_workflows
- 



View it on GitLab: https://salsa.debian.org/med-team/nipype/-/commit/8b9c77591355d708e89cd734e356ccfce6b0f75d

-- 
View it on GitLab: https://salsa.debian.org/med-team/nipype/-/commit/8b9c77591355d708e89cd734e356ccfce6b0f75d
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/20240830/7b6c11da/attachment-0001.htm>