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

PR#4241: fix check-api for python3 bin and requirement of setuptools

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

Fixes: #4240
https://pagure.io/koji/issue/4240
[devtools] check-api requires persent of /usr/bin/python
This commit is contained in:
Mike McLean 2024-10-22 14:33:21 -04:00
commit 589e6bbb96
11 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
devtools/check-api
View file

@ -1,11 +1,10 @@
#!/usr/bin/python
#!/usr/bin/env python3
import inspect
import json
import os
import os.path
import subprocess
import sys
from collections import OrderedDict
# import koji code from our checkout
@ -18,7 +17,7 @@ sys.path.insert(0, kojitop)
setup = kojitop + '/setup.py'
try:
proc = subprocess.Popen(['python', setup, '--version'], stdout=subprocess.PIPE)
proc = subprocess.Popen([sys.executable, setup, '--version'], stdout=subprocess.PIPE)
(out, _) = proc.communicate()
VERSTR = out.decode().strip()
VERSION = tuple([int(x) for x in VERSTR.split('.')])
@ -30,10 +29,10 @@ except Exception:
import koji
import koji.arch
import koji.plugin
import koji.tasks
import koji.util
import koji.xmlrpcplus
import koji.tasks
import koji.plugin
if VERSION >= (1, 32, 0):
from kojihub import kojixmlrpc

1
devtools/containers/Dockerfile.centos8
View file

@ -10,6 +10,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.centos9
View file

@ -10,6 +10,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.f34
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.f35
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.f36
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.f37
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.f38
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.f39
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
devtools/containers/Dockerfile.rawhide
View file

@ -8,6 +8,7 @@ RUN \
python3-defusedxml \
python3-devel \
python3-librepo \
python3-setuptools \
python3-tox \
rpm-build && \
dnf clean all

1
test-requirements.txt
View file

@ -11,3 +11,4 @@ Cheetah3
psycopg2-binary
python-multilib
python-qpid-proton
setuptools