particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#3654: replace deprecated distutils

Browse source 
Merges #3654
https://pagure.io/koji/pull-request/3654

Fixes: #3514
https://pagure.io/koji/issue/3514
Replace deprecated distutils
This commit is contained in:
Tomas Kopecek 2023-01-16 12:36:25 +01:00
commit 99a7e44d2d
7 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/Makefile
View file

@ -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

2
cli/koji_cli/Makefile
View file

@ -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"

8
devtools/get_site_packages.py Normal file
View file

@ -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'))

2
koji/Makefile
View file

@ -3,7 +3,7 @@ PACKAGE = $(shell basename `pwd`)
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))

2
kojihub/Makefile
View file

@ -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

2
plugins/Makefile
View file

@ -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

2
www/lib/kojiweb/Makefile
View file

@ -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)