jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343764 )
Change subject: House modules under a package
......................................................................
House modules under a package
Change-Id: Ifa551b4db4a4e7557c40fbfec4ecf72af8b135b6
---
M bin/cron-generate
M bin/run-job
A processcontrol/__init__.py
R processcontrol/crontab.py
R processcontrol/job_wrapper.py
R processcontrol/lock.py
R processcontrol/mailer.py
M tests/test_crontab.py
M tests/test_job_wrapper.py
M tests/test_lock.py
M tests/test_validation.py
11 files changed, 8 insertions(+), 9 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/cron-generate b/bin/cron-generate
index d1adb6f..52655aa 100755
--- a/bin/cron-generate
+++ b/bin/cron-generate
@@ -2,8 +2,7 @@
import sys
-import crontab
-import job_wrapper
+import processcontrol.crontab
def usage():
@@ -19,4 +18,4 @@
config_dir = sys.argv[1]
- print(crontab.make_cron(config_dir))
+ print(processcontrol.crontab.make_cron(config_dir))
diff --git a/bin/run-job b/bin/run-job
index a3ae229..8a35f6c 100755
--- a/bin/run-job
+++ b/bin/run-job
@@ -2,7 +2,7 @@
import sys
-import job_wrapper
+import processcontrol.job_wrapper
def usage():
@@ -18,5 +18,5 @@
conf_file = sys.argv[1]
- wrapper = job_wrapper.JobWrapper(config_path=conf_file)
+ wrapper = processcontrol.job_wrapper.JobWrapper(config_path=conf_file)
wrapper.run()
diff --git a/processcontrol/__init__.py b/processcontrol/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/processcontrol/__init__.py
diff --git a/crontab.py b/processcontrol/crontab.py
similarity index 100%
rename from crontab.py
rename to processcontrol/crontab.py
diff --git a/job_wrapper.py b/processcontrol/job_wrapper.py
similarity index 100%
rename from job_wrapper.py
rename to processcontrol/job_wrapper.py
diff --git a/lock.py b/processcontrol/lock.py
similarity index 100%
rename from lock.py
rename to processcontrol/lock.py
diff --git a/mailer.py b/processcontrol/mailer.py
similarity index 100%
rename from mailer.py
rename to processcontrol/mailer.py
diff --git a/tests/test_crontab.py b/tests/test_crontab.py
index c0503ad..8cae441 100644
--- a/tests/test_crontab.py
+++ b/tests/test_crontab.py
@@ -1,6 +1,6 @@
import os.path
-import crontab
+from processcontrol import crontab
def test_crontab():
diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index 450a051..f87c6cc 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -3,7 +3,7 @@
import nose
import os
-import job_wrapper
+from processcontrol import job_wrapper
data_dir = os.path.dirname(__file__) + "/data"
diff --git a/tests/test_lock.py b/tests/test_lock.py
index 59ebe97..5c1cf0c 100644
--- a/tests/test_lock.py
+++ b/tests/test_lock.py
@@ -1,7 +1,7 @@
import nose
import os.path
-import lock
+from processcontrol import lock
def tearDown():
diff --git a/tests/test_validation.py b/tests/test_validation.py
index 2cee3e5..f6d6b74 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -1,7 +1,7 @@
import nose
import os
-import job_wrapper
+from processcontrol import job_wrapper
data_dir = os.path.dirname(__file__) + "/data"
--
To view, visit https://gerrit.wikimedia.org/r/343764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa551b4db4a4e7557c40fbfec4ecf72af8b135b6
Gerrit-PatchSet: 6
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
