Merge pull request #2075 from evgenyz/fix-distutils

jan-cerny · web-flow · commit e53916316d55 · 2024-01-29T15:52:55.000+01:00
Replace `distutils.sysconfig` with `sysconfig`
diff --git a/docs/developer/developer.adoc b/docs/developer/developer.adoc
@@ -113,7 +113,7 @@ On Ubuntu 18.04 and potentially other distro, the python3 dist-packages path is
 If the following command:
 
 ----
-$ python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+$ python3 -c "import sysconfig; print(sysconfig.get_path('platlib'))"
 ----
 
 returns "/usr/local/lib/python3/dist-packages" instead of a path like
diff --git a/swig/python3/CMakeLists.txt b/swig/python3/CMakeLists.txt
@@ -26,7 +26,7 @@ add_custom_target(python3_compile ALL DEPENDS ${PYTHON_COMPILED_FILES})
 
 if(NOT PYTHON_SITE_PACKAGES_INSTALL_DIR)
 execute_process(COMMAND
-	${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}'))"
+	${PYTHON_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_path('platlib'))"
 	OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_INSTALL_DIR
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -91,7 +91,7 @@ if(ENABLE_OSCAP_UTIL_DOCKER)
 
 	if(NOT PYTHON_SITE_PACKAGES_INSTALL_DIR)
 	execute_process(COMMAND
-		${OSCAP_DOCKER_PYTHON} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(False, False, prefix='${CMAKE_INSTALL_PREFIX}'))"
+		${OSCAP_DOCKER_PYTHON} -c "import sysconfig; print(sysconfig.get_path('purelib'))"
 		OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_INSTALL_DIR
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ add_custom_target(python3_compile ALL DEPENDS ${PYTHON_COMPILED_FILES})`
`26`	`26`
`27`	`27`	`if(NOT PYTHON_SITE_PACKAGES_INSTALL_DIR)`
`28`	`28`	`execute_process(COMMAND`
`29`		`- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}'))"`
	`29`	`+ ${PYTHON_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_path('platlib'))"`
`30`	`30`	`OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_INSTALL_DIR`
`31`	`31`	`OUTPUT_STRIP_TRAILING_WHITESPACE`
`32`	`32`	`)`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ if(ENABLE_OSCAP_UTIL_DOCKER)`
`91`	`91`
`92`	`92`	`if(NOT PYTHON_SITE_PACKAGES_INSTALL_DIR)`
`93`	`93`	`execute_process(COMMAND`
`94`		`- ${OSCAP_DOCKER_PYTHON} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(False, False, prefix='${CMAKE_INSTALL_PREFIX}'))"`
	`94`	`+ ${OSCAP_DOCKER_PYTHON} -c "import sysconfig; print(sysconfig.get_path('purelib'))"`
`95`	`95`	`OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_INSTALL_DIR`
`96`	`96`	`OUTPUT_STRIP_TRAILING_WHITESPACE`
`97`	`97`	`)`