Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346708 )
Change subject: Update to python3
......................................................................
Update to python3
Change-Id: Iefc697f2adf03e3d7fd587af6bf1e161ea62018f
---
M .gitignore
M Makefile
M processcontrol/runner.py
M requirements.txt
M setup.py
M test-requirements.txt
6 files changed, 9 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/08/346708/1
diff --git a/.gitignore b/.gitignore
index da0b490..be5792a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,5 @@
.cache
cover
.coverage
+debian
.tox
-
-debian/debhelper-build-stamp
-debian/files
-debian/process-control*
diff --git a/Makefile b/Makefile
index fb7bc49..8757871 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,11 @@
nosetests --with-coverage --cover-package=processcontrol --cover-html
@echo Results are in cover/index.html
-deb:
+deb: debian
@echo Note that this is not how we build our production .deb
# FIXME: fragile
- cd ..; tar cjf process-control_0.0.1~rc1.orig.tar.bz2 process-control;
cd process-control
+ cd ..; tar cjf process-control_1.0.5.orig.tar.bz2 process-control; cd
process-control
debuild -us -uc
+
+debian:
+ @[ ! -d debian ] && (echo You can clone the debian directory from
https://github.com/adamwight/process-control-debian ; exit 1)
diff --git a/processcontrol/runner.py b/processcontrol/runner.py
index 5ee090a..1f1bc16 100644
--- a/processcontrol/runner.py
+++ b/processcontrol/runner.py
@@ -48,8 +48,8 @@
if return_code != 0:
self.fail_exitcode(return_code)
except JobFailure as ex:
- config.log.error(ex.message)
- self.mailer.fail_mail(ex.message)
+ config.log.error(str(ex))
+ self.mailer.fail_mail(str(ex))
raise
finally:
if self.job.timeout > 0:
diff --git a/requirements.txt b/requirements.txt
index 733e8ce..c3726e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-argparse # transitional 2->3 package
pyyaml
diff --git a/setup.py b/setup.py
index 306aeea..a6a07ab 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
distutils.core.setup(
name='process-control',
- version='0.0.1',
+ version='1.0.5',
author='Adam Roses Wight',
author_email='[email protected]',
url='https://github.com/adamwight/process-control',
diff --git a/test-requirements.txt b/test-requirements.txt
index d503db3..dcc416a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,4 @@
mock
nose
nose-cov
-pytest
testfixtures
--
To view, visit https://gerrit.wikimedia.org/r/346708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefc697f2adf03e3d7fd587af6bf1e161ea62018f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
