further changes

Makefile

@@ -1,6 +1,6 @@
 NAME=koji
 SPECFILE = $(firstword $(wildcard *.spec))
-SUBDIRS = hub builder koji cli util www plugins vm
+SUBDIRS = kojihub builder koji cli util www plugins vm
 
 ifndef PYTHON
 export PYTHON=python2

devtools/fakehub

@@ -12,7 +12,7 @@ import sys
 from urllib.parse import quote
 
 sys.path.insert(0, os.getcwd())
-sys.path.insert(1, os.path.join(os.getcwd(), 'hub'))
+sys.path.insert(1, os.path.join(os.getcwd(), 'kojihub'))
 import koji
 import kojixmlrpc
 import koji.xmlrpcplus

koji.spec

@@ -405,7 +405,7 @@ make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python2} install
 popd
 %endif
 %if 0%{py2_support} > 1
-for D in hub builder plugins util www vm ; do
+for D in kojihub builder plugins util www vm ; do
     pushd $D
     make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python2} install
     popd
@@ -430,7 +430,7 @@ make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python3} install
 popd
 %endif
 %if 0%{py3_support} > 1
-for D in hub builder plugins util www vm ; do
+for D in kojihub builder plugins util www vm ; do
     pushd $D
     make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} install
     popd
@@ -547,8 +547,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_unitdir}/koji-sweep-db.timer
 
 %files -n python%{python3_pkgversion}-%{name}-hub
+%{_datadir}/koji-hub/*.py
+%{_datadir}/koji-hub/__pycache__
 %{python3_sitelib}/kojihub
-%{_datadir}/koji-hub
 
 %files hub-plugins
 %dir /etc/koji-hub/plugins

kojihub/Makefile

@@ -1,10 +1,9 @@
 PYVER_MAJOR := $(shell $(PYTHON) -c 'import sys; print(".".join(sys.version.split(".")[:1]))')
 PACKAGE = kojihub
-PYFILES = $(wildcard *.py)
+PYFILES = $(filter-out kojiapp.py, $(wildcard *.py))
 PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE)
 
 SERVERDIR = /usr/share/koji-hub
-PYFILES = $(wildcard *.py)
 
 _default:
 	@echo "nothing to make.  try make install"
@@ -33,7 +32,6 @@ install:
 	done
 
 	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(PKGDIR)', 1, '$(PYDIR)', 1)"
-	
-	mkdir -p $(DESTDIR)/usr/share
-	ln -s $(PKGDIR) $(DESTDIR)/$(SERVERDIR)
 
+	mkdir -p $(DESTDIR)/$(SERVERDIR)
+	install -p -m 644 kojiapp.py $(DESTDIR)/$(SERVERDIR)/kojiapp.py

kojihub/httpd.conf

@@ -2,7 +2,7 @@
 # koji-hub is an xmlrpc interface to the Koji database
 #
 
-Alias /kojihub /usr/share/koji-hub/kojixmlrpc.py
+Alias /kojihub /usr/share/koji-hub/kojiapp.py
 
 <Directory "/usr/share/koji-hub">
     Options ExecCGI

kojihub/kojiapp.py

@@ -0,0 +1 @@
+from kojihub.kojixmlrpc import application  # noqa: F401

plugins/hub/runroot_hub.py

@@ -4,14 +4,11 @@
 
 
 import random
-import sys
 
 import koji
 from koji.context import context
 from koji.plugin import export
-# XXX - have to import kojihub for make_task
-sys.path.insert(0, '/usr/share/koji-hub/')
-import kojihub  # noqa: E402
+import kojihub
 
 __all__ = ('runroot',)
 

plugins/hub/save_failed_tree.py

@@ -1,10 +1,7 @@
-import sys
-
 import koji
 from koji.context import context
 from koji.plugin import export
-sys.path.insert(0, '/usr/share/koji-hub/')
-import kojihub  # noqa: E402
+import kojihub
 
 __all__ = ('saveFailedTree',)
 

plugins/hub/sidetag_hub.py

@@ -1,15 +1,13 @@
 # Copyright © 2019 Red Hat, Inc.
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
-import sys
 
 import koji
 from koji.db import QueryProcessor, nextval
 from koji.context import context
 from koji.plugin import callback, export
 import koji.policy
-sys.path.insert(0, "/usr/share/koji-hub/")
-from kojihub import (  # noqa: E402
+from kojihub.kojihub import (
     _create_build_target,
     _create_tag,
     _delete_build_target,

tox.ini

@@ -34,7 +34,7 @@ commands_pre =
 [testenv:py3]
 setenv = 
     {[testenv]setenv}
-    PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/.:plugins/cli/.:cli/.:www/lib
+    PYTHONPATH=kojihub/.:plugins/hub/.:plugins/builder/.:plugins/cli/.:cli/.:www/lib
 commands_pre =
     {[testenv]commands_pre}
     {envbindir}/coverage3 erase --rcfile .coveragerc3