koji

Clone

#4241 fix check-api for python3 bin and requirement of setuptools
Merged 8 months ago by mikem. Opened 8 months ago by julian8628.
julian8628/koji fix-check-api-without-py-bin  into  master

file modified
+4 -5 
@@ -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 @@ 
 

  

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

  

  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

file modified
+1 
@@ -10,6 +10,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -10,6 +10,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -8,6 +8,7 @@ 
 

    python3-defusedxml \
 

    python3-devel \
 

    python3-librepo \
 

+   python3-setuptools \
 

    python3-tox \
 

    rpm-build && \
 

    dnf clean all

file modified
+1 
@@ -11,3 +11,4 @@ 
 

  psycopg2-binary
 

  python-multilib
 

  python-qpid-proton
 

+ setuptools

Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.