Control: tags -1 confirmed +patch

Hello there,

while at St-Cergue's BSP, I took a look at this issue, so here are my 
findings.

* I can confirm it fails to build from source in a main+contrib+non-free 
cowbuilder.

* This FTBFS is the consequence of a new requirement from setuptools; see this 
issue to get it better: https://github.com/pypa/setuptools/issues/2497 .
setuptools now imposes PEP-440-style versioning, that is, the version has to 
match this format:

        [N!]N(.N)*[{a|b|rc}N][.postN][.devN]

But pyHST2 uses the version number in some paths (such as /usr/lib/python3/
dist-packages/PyHST2_2020c(...) ), so it can't simply be patched to use 
"2020.3" (c ~= 3 ?). I can't login to upstream's issues tracker at
https://gitlab.esrf.fr/mirone/pyhst2 but it's clearly something that needs to 
be fixed by a new upstream release.

The attached patch is basically a `sed 's/2020c/2021/g' -i` (also check 
aumento_versione="a" which can work, but should also be amended)  on concerned 
files. It allows to finish building, but the paths have become 
/usr/lib/python3/dist-packages/PyHST2_2021(...), which is clearly not 
upstream's intent.

I'll check if it's possible to only patch the version and not all files.

See you in a bit.

Cheers,

OdyX

Le vendredi, 27 janvier 2023, 15.37:13 h CET Andreas Beckmann a écrit :
> Source: pyhst2
> Version: 2020c-6
> Severity: serious
> Tags: ftbfs
> Justification: fails to build from source
> 
> Hi,
> 
> pyhst2 FTBFS with setuptools 66 that was uploaded today:
> /usr/lib/python3/dist-packages/setuptools/dist.py:548: UserWarning: The
> version specified ('2020ca') is an invalid version, this may not work as
> expected with newer versions of setuptools, pip, and PyPI. Please see PEP
> 440 for more details. warnings.warn(
> running clean
> removing '/build/pyhst2-2020c/.pybuild/cpython3_3.10_pyhst2/build' (and
> everything under it) 'build/bdist.linux-x86_64' does not exist -- can't
> clean it
> 'build/scripts-3.10' does not exist -- can't clean it


-- 
    OdyX
Index: pyhst2/PyHST/__init__.py
===================================================================
--- pyhst2.orig/PyHST/__init__.py
+++ pyhst2/PyHST/__init__.py
@@ -30,4 +30,4 @@
 # is a problem for you.
 #############################################################################*/
 
-version = "2020c"
+version = "2021"
Index: pyhst2/TEST_PYHST/nonregression.py
===================================================================
--- pyhst2.orig/TEST_PYHST/nonregression.py
+++ pyhst2/TEST_PYHST/nonregression.py
@@ -67,7 +67,7 @@ casi=[   "CRAYON",  "HEIKKI",  "HELICOID
 "PATCHES_VECTORIAL",  "SINO_THRESHOLD" ]
 casi=["ID11_SNOW",  "BIG", "LENA",  "LENA_MULTIRINGS",  "MOUSSE",  "MULTIPAGANIN","NANOPOINTS",  "PATCHES_VECTORIAL",  "SINO_THRESHOLD"]
 
-LAUNCHING_INSTRUCTION  = "PyHST2_2020c  input.par"
+LAUNCHING_INSTRUCTION  = "PyHST2_2021  input.par"
 outputprefix="/home/esrf/mirone/nobackup/TEST_PYHST/RESULTS/p9/monogpu"
 # outputprefix="/tmp/TEST_PYHST/RESULTS/p9-04/"
 ###############################################################
Index: pyhst2/scripts_link/pyhst2
===================================================================
--- pyhst2.orig/scripts_link/pyhst2
+++ pyhst2/scripts_link/pyhst2
@@ -1 +1 @@
-PyHST2_2020c $*
+PyHST2_2021 $*
Index: pyhst2/scripts_link/pyhst2_info
===================================================================
--- pyhst2.orig/scripts_link/pyhst2_info
+++ pyhst2/scripts_link/pyhst2_info
@@ -1,6 +1,6 @@
 #!python
 msg = """
-The pyhst2 script launches PyHST2_2020c
+The pyhst2 script launches PyHST2_2021
 
    *** PyHST2_2020a
 
Index: pyhst2/setup.py
===================================================================
--- pyhst2.orig/setup.py
+++ pyhst2/setup.py
@@ -86,7 +86,7 @@ DO_LINK  = 0
 
 global version
 global aumento_versione
-aumento_versione="a"
+aumento_versione=".1"
 
 global version
 
@@ -95,7 +95,7 @@ if DO_LINK==0:
         os.path.abspath(__file__)), "PyHST", "__init__.py"))
                if l.strip().startswith("version")][0]
 else:
-    version = "2020c"
+    version = "2021"
     
 
 def do_link():
@@ -104,7 +104,7 @@ def do_link():
     # aumento_versione=""
 
 
-    version = "2020c"
+    version = "2021"
 
     packages = []
 
Index: pyhst2/stdeb_link.cfg
===================================================================
--- pyhst2.orig/stdeb_link.cfg
+++ pyhst2/stdeb_link.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
-Depends: python-pyhst2-2020c | python-pyhst2-2020c-base
-Depends3: python3-pyhst2-2020c | python3-pyhst2-2020c-base
+Depends: python-pyhst2-2021 | python-pyhst2-2021-base
+Depends3: python3-pyhst2-2021 | python3-pyhst2-2021-base

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to