Merge "Always add prelude for docimpact bugs"
diff --git a/jeepyb/cmd/notify_impact.py b/jeepyb/cmd/notify_impact.py
index 36c957b..c307ede 100644
--- a/jeepyb/cmd/notify_impact.py
+++ b/jeepyb/cmd/notify_impact.py
@@ -250,8 +250,13 @@
parser.add_argument('--topic', default=None)
parser.add_argument('--change-owner', default=None)
+ # patchset-abandoned
+ parser.add_argument('--abandoner', default=None)
+ parser.add_argument('--reason', default=None)
+
# change-merged
parser.add_argument('--submitter', default=None)
+ parser.add_argument('--newrev', default=None)
# patchset-created
parser.add_argument('--uploader', default=None)
diff --git a/jeepyb/cmd/update_blueprint.py b/jeepyb/cmd/update_blueprint.py
index 3e2f10f..8b070c2 100644
--- a/jeepyb/cmd/update_blueprint.py
+++ b/jeepyb/cmd/update_blueprint.py
@@ -140,8 +140,12 @@
parser.add_argument('--commit', default=None)
parser.add_argument('--topic', default=None)
parser.add_argument('--change-owner', default=None)
+ # patchset-abandoned
+ parser.add_argument('--abandoner', default=None)
+ parser.add_argument('--reason', default=None)
# change-merged
parser.add_argument('--submitter', default=None)
+ parser.add_argument('--newrev', default=None)
# patchset-created
parser.add_argument('--uploader', default=None)
parser.add_argument('--patchset', default=None)
diff --git a/jeepyb/cmd/update_bug.py b/jeepyb/cmd/update_bug.py
index 5dc72f5..5f457f5 100644
--- a/jeepyb/cmd/update_bug.py
+++ b/jeepyb/cmd/update_bug.py
@@ -347,6 +347,7 @@
parser.add_argument('--reason', default=None)
# change-merged
parser.add_argument('--submitter', default=None)
+ parser.add_argument('--newrev', default=None)
# patchset-created
parser.add_argument('--uploader', default=None)
parser.add_argument('--patchset', default=None)
diff --git a/jeepyb/cmd/welcome_message.py b/jeepyb/cmd/welcome_message.py
index c8ed843..096832d 100644
--- a/jeepyb/cmd/welcome_message.py
+++ b/jeepyb/cmd/welcome_message.py
@@ -136,8 +136,12 @@
parser.add_argument('--commit', default=None)
parser.add_argument('--topic', default=None)
parser.add_argument('--change-owner', default=None)
+ # patchset-abandoned
+ parser.add_argument('--abandoner', default=None)
+ parser.add_argument('--reason', default=None)
# change-merged
parser.add_argument('--submitter', default=None)
+ parser.add_argument('--newrev', default=None)
# patchset-created
parser.add_argument('--uploader', default=None)
parser.add_argument('--patchset', default=None)
diff --git a/requirements.txt b/requirements.txt
index 9390472..e415d28 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,16 @@
-pbr>=0.6,!=0.7,<1.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr>=1.6
argparse
gerritlib>=0.3.0
PyMySQL
-paramiko
+paramiko>=1.13.0
PyGithub
-pyyaml
+PyYAML>=3.1.0
pkginfo
PyRSS2Gen
-python-swiftclient
-requests>=2.5.2
-six>=1.7.0
+python-swiftclient>=2.2.0
+requests!=2.8.0,>=2.5.2
+six>=1.9.0
diff --git a/setup.py b/setup.py
index c0a24ea..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+ import multiprocessing # noqa
+except ImportError:
+ pass
+
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=1.8'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index a19a9e3..d528919 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,4 @@
-hacking>=0.8.0,<0.9
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+hacking<0.11,>=0.10.2