[med-svn] [Git][med-team/pycorrfit][master] workaround for fixing #1074222 again
vimerbf (@vimerbf-guest)
gitlab at salsa.debian.org
Wed Jul 3 01:44:34 BST 2024
vimerbf pushed to branch master at Debian Med / pycorrfit
Commits:
6c44eee6 by Bo YU at 2024-07-03T00:20:53+08:00
workaround for fixing #1074222 again
Signed-off-by: Bo YU <tsu.yubo at gmail.com>
- - - - -
4 changed files:
- debian/changelog
- debian/control
- − debian/patches/python3.12.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,16 @@
-pycorrfit (1.1.7+dfsg-3) UNRELEASED; urgency=medium
+pycorrfit (1.1.7+dfsg-3) unstable; urgency=medium
- * Replace distutils to gain Python3.12 compatibility
- Closes: #1074222
+ * Team upload.
+
+ [ Bo YU]
+ * Add python3-zombie-imp on d/control to workaround to fix ftbfs.
+ (Closes: #1074222). Thanks Andreas Tille working on this.
+
+ [ Andreas Tille ]
* Standards-Version: 4.7.0 (routine-update)
* Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
- -- Andreas Tille <tille at debian.org> Tue, 25 Jun 2024 20:06:46 +0200
+ -- Bo YU <tsu.yubo at gmail.com> Wed, 03 Jul 2024 00:20:14 +0800
pycorrfit (1.1.7+dfsg-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -26,7 +26,8 @@ Build-Depends: cython3,
texlive-fonts-recommended,
texlive-latex-extra,
texlive-latex-recommended,
- texlive-science
+ texlive-science,
+ python3-zombie-imp,
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/pycorrfit
Vcs-Git: https://salsa.debian.org/med-team/pycorrfit.git
=====================================
debian/patches/python3.12.patch deleted
=====================================
@@ -1,97 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Tue, 25 Jun 2024 20:06:46 +0200
-Bug-Debian: https://bugs.debian.org/1074222
-Description: Replace distutils to gain Python3.12 compatibility
-
---- a/pycorrfit/gui/frontend.py
-+++ b/pycorrfit/gui/frontend.py
-@@ -3,7 +3,7 @@
- The frontend displays the GUI (Graphic User Interface). All necessary
- functions and modules are called from here.
- """
--from distutils.version import LooseVersion # For version checking
-+from packaging.version import Version # For version checking
- import os
- import pathlib
- import platform
-@@ -1313,8 +1313,8 @@ class MyFrame(wx.Frame):
-
- # Check for correct version
- try:
-- arcv = LooseVersion(Infodict["Version"])
-- thisv = LooseVersion(self.version.strip())
-+ arcv = Version(Infodict["Version"])
-+ thisv = Version(self.version.strip())
- if arcv > thisv:
- errstring = "Your version of Pycorrfit ("+str(thisv) +\
- ") is too old to open this session (" +\
---- a/pycorrfit/gui/main.py
-+++ b/pycorrfit/gui/main.py
-@@ -1,5 +1,5 @@
- """Main execution script"""
--from distutils.version import LooseVersion
-+from packaging.version import Version
- import sys
- import warnings
-
-@@ -56,8 +56,8 @@ def CheckVersion(given, required, name):
- the module str *name* the required verion is met or not.
- """
- try:
-- req = LooseVersion(required)
-- giv = LooseVersion(given)
-+ req = Version(required)
-+ giv = Version(given)
- except:
- print(" WARNING: Could not verify version of "+name+".")
- return
---- a/pycorrfit/gui/update.py
-+++ b/pycorrfit/gui/update.py
-@@ -1,5 +1,5 @@
- """PyCorrFit - update checking"""
--from distutils.version import LooseVersion # For version checking
-+from packaging.version import Version # For version checking
- import os
- import tempfile
- import traceback
-@@ -80,7 +80,7 @@ def get_gh_version(ghrepo="user/repo", t
- pass
- else:
- j = simplejson.loads(data)
-- newversion = LooseVersion(j["tag_name"])
-+ newversion = Version(j["tag_name"])
-
- return newversion
-
-@@ -112,9 +112,9 @@ def _update_worker(parent):
-
- ghrepo = "FCS-analysis/PyCorrFit"
- if hasattr(pcf_version, "repo_tag"):
-- old = LooseVersion(pcf_version.repo_tag)
-+ old = Version(pcf_version.repo_tag)
- else:
-- old = LooseVersion(pcf_version.version)
-+ old = Version(pcf_version.version)
-
- new = get_gh_version(ghrepo)
-
---- a/setup.py
-+++ b/setup.py
-@@ -4,10 +4,14 @@ import sys
-
- # The next three lines are necessary for setup.py install to include
- # ChangeLog and Documentation of PyCorrFit
--from distutils.command.install import INSTALL_SCHEMES
--for scheme in INSTALL_SCHEMES.values():
-- scheme['data'] = scheme['purelib']
-+import sysconfig
-
-+install_schemes = sysconfig.get_paths(scheme='posix_prefix') # Use appropriate scheme for your platform
-+
-+# Modify the data path to be the same as the purelib path
-+for key in install_schemes:
-+ if key == 'data':
-+ install_schemes[key] = install_schemes['purelib']
-
- # We don't need to cythonize if a .whl package is available.
- try:
=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
fix_doc.patch
-python3.12.patch
View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/-/commit/6c44eee6cbfbbc30ba67222c6811f177b97e60d4
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/-/commit/6c44eee6cbfbbc30ba67222c6811f177b97e60d4
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/20240703/afbc0584/attachment-0001.htm>
More information about the debian-med-commit
mailing list