Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403157 )
Change subject: Refresh patches for Jessie ...................................................................... Refresh patches for Jessie Pin dependencies based on the last deployed build. Bug: T158243 Change-Id: I9c5407bfa99bffdd4ff4617e26f60ae10b813e33 --- M debian/changelog M debian/control R debian/patches/0005-WMF-drop-requirement-ordereddict.patch D debian/patches/0005-WMF-soften-paramiko-requirement.patch R debian/patches/0006-Do-not-import-paramiko-before-daemonization.patch D debian/patches/0006-WMF-soften-WebOb-requirement.patch R debian/patches/0007-Gerrit-trailing-delay-is-now-configurable.patch R debian/patches/0008-WMF-constraint-apscheduler-to-3.1.0.patch R debian/patches/0009-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch R debian/patches/0010-Add-__repr__-to-a-few-classes.patch D debian/patches/0010-WMF-soften-pbr-requirement.patch R debian/patches/0011-Don-t-merge-queues-if-the-common-job-is-noop.patch R debian/patches/0012-WMF-install-zuul-clear-refs.patch A debian/patches/0013-WMF-pin-voluptuous-0.10.patch A debian/patches/0014-WMF-pin-requirements-to-what-is-deployed.patch M debian/patches/series 16 files changed, 91 insertions(+), 86 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul refs/changes/57/403157/1 diff --git a/debian/changelog b/debian/changelog index 8b0545b..a2f8bbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +zuul (2.5.0-8-gcbc7f62-wmf5jessie1) jessie-wikimedia; urgency=medium + + * debian/source/options ignore a few more files + * WebOb / Paramkiko on Jessie do match upstream requirements.txt, drop the + related patch that removed the lower bound. + * Use python-prettytable Debian package + + -- Antoine Musso <has...@free.fr> Tue, 09 Jan 2018 14:49:56 +0100 + zuul (2.5.0-8-gcbc7f62-wmf4jessie1) jessie-wikimedia; urgency=medium * sync with precise-wikimedia: diff --git a/debian/control b/debian/control index cd9e353..bacf11c 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ python-voluptuous (>= 0.7), #python-gear (>= 0.5.4), #python-apscheduler (>= 2.1.1), -#python-prettytable (>= 0.6), + python-prettytable (>= 0.6), python-tz, python-babel (>= 1.0), python-six (>= 1.6.0), @@ -87,7 +87,7 @@ python-voluptuous (>= 0.7), #python-gear (>= 0.5.4), # python-apscheduler (>= 2.1.1), -# python-prettytable (>= 0.6), + python-prettytable (>= 0.6), python-six (>= 1.6.0), python-tz, python-babel (>= 1.0), diff --git a/debian/patches/0007-WMF-drop-requirement-ordereddict.patch b/debian/patches/0005-WMF-drop-requirement-ordereddict.patch similarity index 87% rename from debian/patches/0007-WMF-drop-requirement-ordereddict.patch rename to debian/patches/0005-WMF-drop-requirement-ordereddict.patch index 93f7b93..8c6cc1a 100644 --- a/debian/patches/0007-WMF-drop-requirement-ordereddict.patch +++ b/debian/patches/0005-WMF-drop-requirement-ordereddict.patch @@ -10,12 +10,12 @@ 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt -index e06feb5..69484c7 100644 +index 77ac0a5..793773e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ Paste - WebOb - paramiko + WebOb>=1.2.3 + paramiko>=1.8.0,<2.0.0 GitPython>=0.3.3 -ordereddict python-daemon>=2.0.4,<2.1.0 diff --git a/debian/patches/0005-WMF-soften-paramiko-requirement.patch b/debian/patches/0005-WMF-soften-paramiko-requirement.patch deleted file mode 100644 index aa8dc80..0000000 --- a/debian/patches/0005-WMF-soften-paramiko-requirement.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Antoine Musso <has...@free.fr> -Date: Fri, 22 Jul 2016 15:15:54 +0200 -Subject: WMF: soften paramiko requirement - -1.7 on Precise is good enough for us. - -Change-Id: I561e5ed2ff459af02910ef4bb1d803976970a48b ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index 77ac0a5..2fe384b 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -3,7 +3,7 @@ pbr>=1.1.0 - PyYAML>=3.1.0 - Paste - WebOb>=1.2.3 --paramiko>=1.8.0,<2.0.0 -+paramiko - GitPython>=0.3.3 - ordereddict - python-daemon>=2.0.4,<2.1.0 diff --git a/debian/patches/0008-Do-not-import-paramiko-before-daemonization.patch b/debian/patches/0006-Do-not-import-paramiko-before-daemonization.patch similarity index 100% rename from debian/patches/0008-Do-not-import-paramiko-before-daemonization.patch rename to debian/patches/0006-Do-not-import-paramiko-before-daemonization.patch diff --git a/debian/patches/0006-WMF-soften-WebOb-requirement.patch b/debian/patches/0006-WMF-soften-WebOb-requirement.patch deleted file mode 100644 index 6f97948..0000000 --- a/debian/patches/0006-WMF-soften-WebOb-requirement.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Antoine Musso <has...@free.fr> -Date: Fri, 22 Jul 2016 15:16:35 +0200 -Subject: WMF: soften WebOb requirement - -Precise version is good enough for us. - -Change-Id: I8ec22828b4c44f6869f06834a4123a1801ce97c1 ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index 2fe384b..e06feb5 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -2,7 +2,7 @@ pbr>=1.1.0 - - PyYAML>=3.1.0 - Paste --WebOb>=1.2.3 -+WebOb - paramiko - GitPython>=0.3.3 - ordereddict diff --git a/debian/patches/0009-Gerrit-trailing-delay-is-now-configurable.patch b/debian/patches/0007-Gerrit-trailing-delay-is-now-configurable.patch similarity index 100% rename from debian/patches/0009-Gerrit-trailing-delay-is-now-configurable.patch rename to debian/patches/0007-Gerrit-trailing-delay-is-now-configurable.patch diff --git a/debian/patches/0011-WMF-constraint-apscheduler-to-3.1.0.patch b/debian/patches/0008-WMF-constraint-apscheduler-to-3.1.0.patch similarity index 95% rename from debian/patches/0011-WMF-constraint-apscheduler-to-3.1.0.patch rename to debian/patches/0008-WMF-constraint-apscheduler-to-3.1.0.patch index 379f04b..8a91857 100644 --- a/debian/patches/0011-WMF-constraint-apscheduler-to-3.1.0.patch +++ b/debian/patches/0008-WMF-constraint-apscheduler-to-3.1.0.patch @@ -13,7 +13,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt -index c85f242..3ab3540 100644 +index 793773e..f98bdd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ extras diff --git a/debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch b/debian/patches/0009-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch similarity index 100% rename from debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch rename to debian/patches/0009-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch diff --git a/debian/patches/0013-Add-__repr__-to-a-few-classes.patch b/debian/patches/0010-Add-__repr__-to-a-few-classes.patch similarity index 100% rename from debian/patches/0013-Add-__repr__-to-a-few-classes.patch rename to debian/patches/0010-Add-__repr__-to-a-few-classes.patch diff --git a/debian/patches/0010-WMF-soften-pbr-requirement.patch b/debian/patches/0010-WMF-soften-pbr-requirement.patch deleted file mode 100644 index c75362e..0000000 --- a/debian/patches/0010-WMF-soften-pbr-requirement.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Antoine Musso <has...@free.fr> -Date: Fri, 22 Jul 2016 15:33:50 +0200 -Subject: WMF: soften pbr requirement - -The old >=0.5.21 should be good enough. - -Change-Id: Ia279bc09b886a3be86894ad13261c842bd9cb95b ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index 69484c7..c85f242 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,4 +1,4 @@ --pbr>=1.1.0 -+pbr>=0.5.21 - - PyYAML>=3.1.0 - Paste diff --git a/debian/patches/0014-Don-t-merge-queues-if-the-common-job-is-noop.patch b/debian/patches/0011-Don-t-merge-queues-if-the-common-job-is-noop.patch similarity index 100% rename from debian/patches/0014-Don-t-merge-queues-if-the-common-job-is-noop.patch rename to debian/patches/0011-Don-t-merge-queues-if-the-common-job-is-noop.patch diff --git a/debian/patches/0015-WMF-install-zuul-clear-refs.patch b/debian/patches/0012-WMF-install-zuul-clear-refs.patch similarity index 100% rename from debian/patches/0015-WMF-install-zuul-clear-refs.patch rename to debian/patches/0012-WMF-install-zuul-clear-refs.patch diff --git a/debian/patches/0013-WMF-pin-voluptuous-0.10.patch b/debian/patches/0013-WMF-pin-voluptuous-0.10.patch new file mode 100644 index 0000000..3bb93d5 --- /dev/null +++ b/debian/patches/0013-WMF-pin-voluptuous-0.10.patch @@ -0,0 +1,25 @@ +From: Antoine Musso <has...@free.fr> +Date: Thu, 13 Apr 2017 16:59:44 +0200 +Subject: WMF: pin voluptuous<0.10 + +Our Zuul version is not compatible with voluptuous 0.10+ that got +released on April 12th 2017. So pin it. + +Change-Id: Ifdb8de868b23128c66813f0e6ff89738d7693378 +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index f98bdd6..ced583d 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -8,7 +8,7 @@ GitPython>=0.3.3 + python-daemon>=2.0.4,<2.1.0 + extras + statsd>=1.0.0,<3.0 +-voluptuous>=0.7 ++voluptuous>=0.7,<0.10 + gear>=0.5.7,<1.0.0 + apscheduler>=3.0,<3.1.0 + PrettyTable>=0.6,<0.8 diff --git a/debian/patches/0014-WMF-pin-requirements-to-what-is-deployed.patch b/debian/patches/0014-WMF-pin-requirements-to-what-is-deployed.patch new file mode 100644 index 0000000..167a1b1 --- /dev/null +++ b/debian/patches/0014-WMF-pin-requirements-to-what-is-deployed.patch @@ -0,0 +1,41 @@ +From: Antoine Musso <has...@free.fr> +Date: Tue, 9 Jan 2018 14:44:06 +0100 +Subject: WMF: pin requirements to what is deployed + +Based on what has been previously grabbed via dh_virtualenv and is known +to work on production. + +python-prettytable 0.7.2 is available in Jessie so we should use it. + +Bug: T158243 +Change-Id: I7446aa6441ed975c8ec1f35ba70085a1bb598bf9 +--- + requirements.txt | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/requirements.txt b/requirements.txt +index ced583d..071a29d 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -4,13 +4,17 @@ PyYAML>=3.1.0 + Paste + WebOb>=1.2.3 + paramiko>=1.8.0,<2.0.0 +-GitPython>=0.3.3 ++GitPython==2.0.8 ++smmap==0.9.0 ++gitdb==0.6.4 + python-daemon>=2.0.4,<2.1.0 ++lockfile==0.12.2 + extras +-statsd>=1.0.0,<3.0 ++statsd==2.1.2 + voluptuous>=0.7,<0.10 +-gear>=0.5.7,<1.0.0 +-apscheduler>=3.0,<3.1.0 ++futures==3.0.5 ++gear==0.7.0 ++apscheduler==3.0.6 + PrettyTable>=0.6,<0.8 + babel>=1.0 + six>=1.6.0 diff --git a/debian/patches/series b/debian/patches/series index a78bc65..2932944 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,14 +2,13 @@ 0002-Replace-python-shebang-with-python2.7.patch 0003-Cloner-Implement-cache-no-hardlinks-argument.patch 0004-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch -0005-WMF-soften-paramiko-requirement.patch -0006-WMF-soften-WebOb-requirement.patch -0007-WMF-drop-requirement-ordereddict.patch -0008-Do-not-import-paramiko-before-daemonization.patch -0009-Gerrit-trailing-delay-is-now-configurable.patch -0010-WMF-soften-pbr-requirement.patch -0011-WMF-constraint-apscheduler-to-3.1.0.patch -0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch -0013-Add-__repr__-to-a-few-classes.patch -0014-Don-t-merge-queues-if-the-common-job-is-noop.patch -0015-WMF-install-zuul-clear-refs.patch +0005-WMF-drop-requirement-ordereddict.patch +0006-Do-not-import-paramiko-before-daemonization.patch +0007-Gerrit-trailing-delay-is-now-configurable.patch +0008-WMF-constraint-apscheduler-to-3.1.0.patch +0009-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch +0010-Add-__repr__-to-a-few-classes.patch +0011-Don-t-merge-queues-if-the-common-job-is-noop.patch +0012-WMF-install-zuul-clear-refs.patch +0013-WMF-pin-voluptuous-0.10.patch +0014-WMF-pin-requirements-to-what-is-deployed.patch -- To view, visit https://gerrit.wikimedia.org/r/403157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c5407bfa99bffdd4ff4617e26f60ae10b813e33 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/jessie-wikimedia Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
