Xisco Fauli
f41773d684
Since a1295cb177
"python: upgrade to 3.10.14 (master only)"
Now it fails with
Traceback (most recent call last):
File "/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/UnpackedTarball/lxml/setup.py", line 23, in <module>
import setupinfo
File "/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/UnpackedTarball/lxml/setupinfo.py", line 7, in <module>
from distutils.command.build_ext import build_ext as _build_ext
File "/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/instdir/program/python-core-3.10.14/lib/distutils/command/build_ext.py", line 13, in <module>
from distutils.sysconfig import customize_compiler, get_python_version
File "/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/instdir/program/python-core-3.10.14/lib/distutils/sysconfig.py", line 58, in <module>
warnings.warn(
DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead
make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/external/lxml/ExternalProject_lxml.mk:26: /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/ExternalProject/lxml/build] Error 1
Change-Id: I9000018390b31a65a30ef87d0c500872fc6c9343
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170069
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
34 lines
1.0 KiB
Plaintext
34 lines
1.0 KiB
Plaintext
--- Lib/distutils/__init__.py 2024-07-06 14:41:11.881840873 +0200
|
|
+++ Lib/distutils/__init__.py 2024-07-06 14:41:31.725586707 +0200
|
|
@@ -7,14 +7,3 @@
|
|
|
|
setup (...)
|
|
"""
|
|
-
|
|
-import sys
|
|
-import warnings
|
|
-
|
|
-__version__ = sys.version[:sys.version.index(' ')]
|
|
-
|
|
-_DEPRECATION_MESSAGE = ("The distutils package is deprecated and slated for "
|
|
- "removal in Python 3.12. Use setuptools or check "
|
|
- "PEP 632 for potential alternatives")
|
|
-warnings.warn(_DEPRECATION_MESSAGE,
|
|
- DeprecationWarning, 2)
|
|
--- Lib/distutils/sysconfig.py 2024-07-06 18:03:30.397986006 +0200
|
|
+++ Lib/distutils/sysconfig.py 2024-07-06 18:03:58.637312653 +0200
|
|
@@ -55,13 +55,6 @@
|
|
if os.name == "nt":
|
|
from sysconfig import _fix_pcbuild
|
|
|
|
-warnings.warn(
|
|
- 'The distutils.sysconfig module is deprecated, use sysconfig instead',
|
|
- DeprecationWarning,
|
|
- stacklevel=2
|
|
-)
|
|
-
|
|
-
|
|
# Following functions are the same as in sysconfig but with different API
|
|
def parse_config_h(fp, g=None):
|
|
return sysconfig_parse_config_h(fp, vars=g)
|