rename requests to obs_request

Change-Id: Iab87c78fd5097e2ca22432afc93fabaf61964640

diff --git a/common/iris_rest_client.py b/common/iris_rest_client.py
index 618b4f0..5260a98 100644 (file)
--- a/common/iris_rest_client.py
+++ b/common/iris_rest_client.py
@@ -1,14 +1,7 @@
 """IRIS requests client"""
 
 
-import sys
 import urlparse
-from distutils.sysconfig import get_python_lib
-
-# Sets python lib as the first item in python search path,
-# directs Python to search modules in it first.
-sys.path.insert(0, get_python_lib())
-
 import requests
 
 

diff --git a/job_request.py b/job_request.py
index cb84d6b..66854bd 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -9,7 +9,7 @@ from common.gerrit import Gerrit, GerritError
 from common.buildtrigger import trigger_info, trigger_next
 from common.send_mail import prepare_mail
 from common.buildservice import BuildService
-from requests.mailer import mailer
+from obs_requests.mailer import mailer
 from gbp.git.repository import GitRepositoryError
 from gitbuildsys.errors import ObsError
 

diff --git a/job_sync_snapdiff.py b/job_sync_snapdiff.py
index 48d51df..7a21f29 100755 (executable)
--- a/job_sync_snapdiff.py
+++ b/job_sync_snapdiff.py
@@ -11,9 +11,6 @@ import os
 import re
 import sys
 from distutils.sysconfig import get_python_lib
-
-sys.path.insert(0, get_python_lib())
-
 import bs4
 from jinja2 import Environment, FileSystemLoader
 import requests

diff --git a/requests/__init__.py b/obs_requests/__init__.py
similarity index 100%
rename from requests/__init__.py
rename to obs_requests/__init__.py

diff --git a/requests/email_templates/obs_request_accept b/obs_requests/email_templates/obs_request_accept
similarity index 100%
rename from requests/email_templates/obs_request_accept
rename to obs_requests/email_templates/obs_request_accept

diff --git a/requests/email_templates/obs_request_auto_reject b/obs_requests/email_templates/obs_request_auto_reject
similarity index 100%
rename from requests/email_templates/obs_request_auto_reject
rename to obs_requests/email_templates/obs_request_auto_reject

diff --git a/requests/email_templates/obs_request_changedevel b/obs_requests/email_templates/obs_request_changedevel
similarity index 100%
rename from requests/email_templates/obs_request_changedevel
rename to obs_requests/email_templates/obs_request_changedevel

diff --git a/requests/email_templates/obs_request_changedevel_accept b/obs_requests/email_templates/obs_request_changedevel_accept
similarity index 100%
rename from requests/email_templates/obs_request_changedevel_accept
rename to obs_requests/email_templates/obs_request_changedevel_accept

diff --git a/requests/email_templates/obs_request_changedevel_decline b/obs_requests/email_templates/obs_request_changedevel_decline
similarity index 100%
rename from requests/email_templates/obs_request_changedevel_decline
rename to obs_requests/email_templates/obs_request_changedevel_decline

diff --git a/requests/email_templates/obs_request_changedevel_revoke b/obs_requests/email_templates/obs_request_changedevel_revoke
similarity index 100%
rename from requests/email_templates/obs_request_changedevel_revoke
rename to obs_requests/email_templates/obs_request_changedevel_revoke

diff --git a/requests/email_templates/obs_request_create b/obs_requests/email_templates/obs_request_create
similarity index 100%
rename from requests/email_templates/obs_request_create
rename to obs_requests/email_templates/obs_request_create

diff --git a/requests/email_templates/obs_request_decline b/obs_requests/email_templates/obs_request_decline
similarity index 100%
rename from requests/email_templates/obs_request_decline
rename to obs_requests/email_templates/obs_request_decline

diff --git a/requests/email_templates/obs_request_delpkg b/obs_requests/email_templates/obs_request_delpkg
similarity index 100%
rename from requests/email_templates/obs_request_delpkg
rename to obs_requests/email_templates/obs_request_delpkg

diff --git a/requests/email_templates/obs_request_delpkg_accept b/obs_requests/email_templates/obs_request_delpkg_accept
similarity index 100%
rename from requests/email_templates/obs_request_delpkg_accept
rename to obs_requests/email_templates/obs_request_delpkg_accept

diff --git a/requests/email_templates/obs_request_delpkg_decline b/obs_requests/email_templates/obs_request_delpkg_decline
similarity index 100%
rename from requests/email_templates/obs_request_delpkg_decline
rename to obs_requests/email_templates/obs_request_delpkg_decline

diff --git a/requests/email_templates/obs_request_delpkg_revoke b/obs_requests/email_templates/obs_request_delpkg_revoke
similarity index 100%
rename from requests/email_templates/obs_request_delpkg_revoke
rename to obs_requests/email_templates/obs_request_delpkg_revoke

diff --git a/requests/email_templates/obs_request_maintainer b/obs_requests/email_templates/obs_request_maintainer
similarity index 100%
rename from requests/email_templates/obs_request_maintainer
rename to obs_requests/email_templates/obs_request_maintainer

diff --git a/requests/email_templates/obs_request_maintainer_accept b/obs_requests/email_templates/obs_request_maintainer_accept
similarity index 100%
rename from requests/email_templates/obs_request_maintainer_accept
rename to obs_requests/email_templates/obs_request_maintainer_accept

diff --git a/requests/email_templates/obs_request_maintainer_decline b/obs_requests/email_templates/obs_request_maintainer_decline
similarity index 100%
rename from requests/email_templates/obs_request_maintainer_decline
rename to obs_requests/email_templates/obs_request_maintainer_decline

diff --git a/requests/email_templates/obs_request_maintainer_revoke b/obs_requests/email_templates/obs_request_maintainer_revoke
similarity index 100%
rename from requests/email_templates/obs_request_maintainer_revoke
rename to obs_requests/email_templates/obs_request_maintainer_revoke

diff --git a/requests/email_templates/obs_request_newpkg b/obs_requests/email_templates/obs_request_newpkg
similarity index 100%
rename from requests/email_templates/obs_request_newpkg
rename to obs_requests/email_templates/obs_request_newpkg

diff --git a/requests/email_templates/obs_request_revoke b/obs_requests/email_templates/obs_request_revoke
similarity index 100%
rename from requests/email_templates/obs_request_revoke
rename to obs_requests/email_templates/obs_request_revoke

diff --git a/requests/mailer.py b/obs_requests/mailer.py
similarity index 100%
rename from requests/mailer.py
rename to obs_requests/mailer.py

diff --git a/packaging/jenkins-scripts.spec b/packaging/jenkins-scripts.spec
index f216796..0e4f80f 100644 (file)
--- a/packaging/jenkins-scripts.spec
+++ b/packaging/jenkins-scripts.spec
@@ -66,7 +66,7 @@ Isolated job_submitobs to avoid package installation conflicts
 
 %install
 install -d %{buildroot}%{destdir}
-cp -r job_*.py common requests templates %{buildroot}%{destdir}/
+cp -r job_*.py common obs_requests templates %{buildroot}%{destdir}/
 
 %post common
 if [ ! -d /var/lib/jenkins/userContent ]; then
@@ -92,7 +92,7 @@ fi
 %{destdir}/job_publish_test_results.py
 %{destdir}/job_request.py
 %{destdir}/job_test_build.py
-%{destdir}/requests
+%{destdir}/obs_requests
 %{destdir}/common/tempbuildpkg.py
 
 %files common