Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/343954 )
Change subject: target python2 for now ...................................................................... target python2 for now Change-Id: I5eaa0aa4380f54263eadfd208584ef9c3bee2c22 --- M bin/cron-generate M bin/run-job M debian/control M debian/rules M setup.py 5 files changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/54/343954/1 diff --git a/bin/cron-generate b/bin/cron-generate index 52655aa..5a656b6 100755 --- a/bin/cron-generate +++ b/bin/cron-generate @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python import sys diff --git a/bin/run-job b/bin/run-job index 8a35f6c..788625b 100755 --- a/bin/run-job +++ b/bin/run-job @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python import sys diff --git a/debian/control b/debian/control index f0214cf..0178c6c 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,15 @@ Maintainer: Adam Roses Wight <awi...@wikimedia.org> Section: admin Priority: optional -Build-Depends: debhelper (>= 9), python3-all, python3-setuptools +Build-Depends: debhelper (>= 9), dh-python, python-all, python-setuptools Standards-Version: 3.9.8 Homepage: https://github.com/adamwight/process-control Vcs-Browser: https://github.com/adamwight/process-control Vcs-Git: git://github.com/adamwight/process-control.git -X-Python3-Version: >= 3.2 +X-Python-Version: >= 2.7 Package: process-control Architecture: all -Depends: ${python3:Depends}, python3-yaml +Depends: ${python:Depends}, python-yaml Description: Tools for Wikimedia Foundation Fundraising job management Control and schedule jobs using configuration files. diff --git a/debian/rules b/debian/rules index 086b21a..6af70d4 100755 --- a/debian/rules +++ b/debian/rules @@ -4,4 +4,4 @@ export PYBUILD_NAME=process-control %: - dh $@ --with python3 + dh $@ --with python2 diff --git a/setup.py b/setup.py index d80d0eb..306aeea 100755 --- a/setup.py +++ b/setup.py @@ -8,11 +8,7 @@ author='Adam Roses Wight', author_email='awi...@wikimedia.org', url='https://github.com/adamwight/process-control', - py_modules=[ - 'crontab', - 'job_wrapper', - 'lock', - ], + packages=['processcontrol'], scripts=[ 'bin/cron-generate', 'bin/run-job', -- To view, visit https://gerrit.wikimedia.org/r/343954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5eaa0aa4380f54263eadfd208584ef9c3bee2c22 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight <awi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
