PR#3654: replace deprecated distutils - koji

Tomas Kopecek • a year ago

3e8e185

cli/Makefile

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`SUBDIRS=koji_cli`

		PACKAGE = $(shell basename `pwd`)
		`- PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)`
		`+ PKGDIR = $(shell $(PYTHON) ../devtools/get_site_packages.py )/$(PACKAGE)`

		`FILES = koji`

cli/koji_cli/Makefile

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`PYFILES = $(wildcard *.py)`

		PACKAGE = $(shell basename `pwd`)
		`- PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)`
		`+ PKGDIR = $(shell $(PYTHON) ../../devtools/get_site_packages.py )/$(PACKAGE)`

		`_default:`
		`@echo "nothing to make. try make install"`

devtools/get_site_packages.py

file added

		`@@ -0,0 +1,8 @@`
		`+ # prints site-packages path for use in Makefiles`
		`+`
		`+ try:`
		`+ from distutils.sysconfig import get_python_lib`
		`+ print(get_python_lib())`
		`+ except ImportError:`
		`+ import sysconfig`
		`+ print(sysconfig.get_path('purelib', 'rpm_prefix'))`

koji/Makefile

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`PYFILES_ALL = $(wildcard *.py)`
		`PYSCRIPTS =`
		`SUBDIRS =`
		`- PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)`
		`+ PKGDIR = $(shell $(PYTHON) ../devtools/get_site_packages.py )/$(PACKAGE)`

		`ifeq ($(PYVER_MAJOR),2)`
		`PYFILES=$(filter-out db.py,$(PYFILES_ALL))`

kojihub/Makefile

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`PYVER_MAJOR := $(shell $(PYTHON) -c 'import sys; print(".".join(sys.version.split(".")[:1]))')`
		`PACKAGE = kojihub`
		`PYFILES = $(wildcard *.py)`
		`- PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)`
		`+ PKGDIR = $(shell $(PYTHON) ../devtools/get_site_packages.py )/$(PACKAGE)`

		`SERVERDIR = /usr/share/koji-hub`

plugins/Makefile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`PYVER_MAJOR := $(shell $(PYTHON) -c 'import sys; print(".".join(sys.version.split(".")[:1]))')`
		`- PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)`
		`+ PKGDIR = $(shell $(PYTHON) ../devtools/get_site_packages.py )/$(PACKAGE)`

		`CLIPLUGINDIR = $(PKGDIR)/koji_cli_plugins`
		`HUBPLUGINDIR = /usr/lib/koji-hub-plugins`

www/lib/kojiweb/Makefile

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		PACKAGE = $(shell basename `pwd`)
		`PYFILES = $(wildcard *.py)`
		`- PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)`
		`+ PKGDIR = $(shell $(PYTHON) ../../devtools/get_site_packages.py )/$(PACKAGE)`

		`SERVERDIR = /kojiweb`
		`FILES = $(wildcard .py .chtml)`