From b4667e09b48880ac546d71b0cbcab8b4928678e7 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 13:27:22 -0700
Subject: [PATCH 01/13] Betterize header message

---
 Makefile                 |  2 +-
 scripts/write-headers.sh | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 scripts/write-headers.sh

diff --git a/Makefile b/Makefile
index 26364cec39..b677e84bab 100644
--- a/Makefile
+++ b/Makefile
@@ -920,7 +920,7 @@ debs:
 	# Copy over shared dist utils module which is needed by setup.py
 	@for component in $(COMPONENTS_WITH_RUNNERS); do\
 		cp -f ./scripts/dist_utils.py $$component/dist_utils.py;\
-		sed -i -e '1s;^;# NOTE: This file is auto-generated - DO NOT EDIT MANUALLY\n;' $$component/dist_utils.py;\
+		scripts/write-headers.sh $$component/dist_utils.py || break;\
 	done
 
 	# Copy over CHANGELOG.RST, CONTRIBUTING.RST and LICENSE file to each component directory
diff --git a/scripts/write-headers.sh b/scripts/write-headers.sh
new file mode 100755
index 0000000000..ccbdc74d6b
--- /dev/null
+++ b/scripts/write-headers.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+HEADER="# NOTE: This file is auto-generated - DO NOT EDIT MANUALLY\\
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to\\
+#       update dist_utils.py files for all components\\
+"
+
+if [[ $(uname) == "Linux" ]]; then
+	sed -i -e "1s;^;$HEADER;" $* || exit -1
+elif [[ $(uname) == "Darwin" ]]; then
+	sed -i '' -e "1s;^;$HEADER;" $* || exit -1
+else
+	echo >&2 "Unknown OS"
+	exit -1
+fi
+

From f8117cd0349a748ee0989e058e45f5c5a304bc43 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 14:45:59 -0700
Subject: [PATCH 02/13] Update to amqp 2.5.1

---
 fixed-requirements.txt                                   | 2 +-
 st2common/tests/fixtures/requirements-used-for-tests.txt | 2 +-
 st2common/tests/unit/test_dist_utils.py                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fixed-requirements.txt b/fixed-requirements.txt
index a06c8d7f30..bee17fe434 100644
--- a/fixed-requirements.txt
+++ b/fixed-requirements.txt
@@ -7,7 +7,7 @@ eventlet==0.25.0
 gunicorn==19.9.0
 kombu==4.6.4
 # Note: amqp is used by kombu
-amqp==2.5.0
+amqp==2.5.1
 # NOTE: Recent version substantially affect the performance and add big import time overhead
 # See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details
 oslo.config>=1.12.1,<1.13
diff --git a/st2common/tests/fixtures/requirements-used-for-tests.txt b/st2common/tests/fixtures/requirements-used-for-tests.txt
index 58352b169c..25b385dd1c 100644
--- a/st2common/tests/fixtures/requirements-used-for-tests.txt
+++ b/st2common/tests/fixtures/requirements-used-for-tests.txt
@@ -1,6 +1,6 @@
 # Don't edit this file. It's generated automatically!
 RandomWords
-amqp==2.4.2
+amqp==2.5.1
 argcomplete
 bcrypt==3.1.6
 flex==6.14.0
diff --git a/st2common/tests/unit/test_dist_utils.py b/st2common/tests/unit/test_dist_utils.py
index a436f33e02..d2fde3f264 100644
--- a/st2common/tests/unit/test_dist_utils.py
+++ b/st2common/tests/unit/test_dist_utils.py
@@ -104,7 +104,7 @@ def test_apply_vagrant_workaround(self):
     def test_fetch_requirements(self):
         expected_reqs = [
             'RandomWords',
-            'amqp==2.4.2',
+            'amqp==2.5.1',
             'argcomplete',
             'bcrypt==3.1.6',
             'flex==6.14.0',

From e18fe262dda8b4c529d0f77af21b03ce7486c7ac Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 15:04:05 -0700
Subject: [PATCH 03/13] Allow pyyaml > 5.0

---
 st2common/st2common/constants/pack.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/st2common/st2common/constants/pack.py b/st2common/st2common/constants/pack.py
index 82a8ed6b80..4c9035ae92 100644
--- a/st2common/st2common/constants/pack.py
+++ b/st2common/st2common/constants/pack.py
@@ -89,7 +89,7 @@
 # Python requirements which are common to all the packs and need to be installed
 # for Python 3 pack virtual environments to work
 BASE_PACK_PYTHON3_REQUIREMENTS = [
-    'pyyaml>=3.12,<4.0'
+    'pyyaml>=5.1,<5.2'
 ]
 
 # Name of the pack manifest file

From 97e8b2baf1973d52a3110a3faebe203b01164764 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 15:18:36 -0700
Subject: [PATCH 04/13] Update prance to 0.15.0

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b677e84bab..85c495849e 100644
--- a/Makefile
+++ b/Makefile
@@ -478,7 +478,7 @@ requirements: virtualenv .sdist-requirements install-runners
 	# Note: We install prance here and not as part of any component
 	# requirements.txt because it has a conflict with our dependency (requires
 	# new version of requests) which we cant resolve at this moment
-	$(VIRTUALENV_DIR)/bin/pip install "prance==0.6.1"
+	$(VIRTUALENV_DIR)/bin/pip install "prance==0.15.0"
 
 	# Install st2common to register metrics drivers
 	# NOTE: We pass --no-deps to the script so we don't install all the

From 8977bcd509dde5da7a00a4b6fd497799f15a0bf3 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 15:19:28 -0700
Subject: [PATCH 05/13] Downgrade requests to <2.22.0 to match prance
 requirements

---
 fixed-requirements.txt                                   | 2 +-
 st2common/tests/fixtures/requirements-used-for-tests.txt | 2 +-
 st2common/tests/unit/test_dist_utils.py                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fixed-requirements.txt b/fixed-requirements.txt
index bee17fe434..9d5d70468c 100644
--- a/fixed-requirements.txt
+++ b/fixed-requirements.txt
@@ -14,7 +14,7 @@ oslo.config>=1.12.1,<1.13
 oslo.utils>=3.36.2,<=3.37.0
 six==1.12.0
 pyyaml==5.1.2
-requests[security]>=2.22.0,<2.23.0
+requests[security]>=2.21.0,<2.22.0
 apscheduler==3.6.1
 gitpython==2.1.11
 jsonschema==2.6.0
diff --git a/st2common/tests/fixtures/requirements-used-for-tests.txt b/st2common/tests/fixtures/requirements-used-for-tests.txt
index 25b385dd1c..40cfdfe356 100644
--- a/st2common/tests/fixtures/requirements-used-for-tests.txt
+++ b/st2common/tests/fixtures/requirements-used-for-tests.txt
@@ -18,6 +18,6 @@ svn+svn://svn.repo/some_pkg/trunk/@ma-branch#egg=SomePackageSvn
 gitpython==2.1.11
 ose-timer==0.7.5
 oslo.config<1.13,>=1.12.1
-requests[security]<2.23.0,>=2.22.0
+requests[security]<2.22.0,>=2.21.0
 retrying==1.3.3
 zake==0.2.2
diff --git a/st2common/tests/unit/test_dist_utils.py b/st2common/tests/unit/test_dist_utils.py
index d2fde3f264..9c24320c21 100644
--- a/st2common/tests/unit/test_dist_utils.py
+++ b/st2common/tests/unit/test_dist_utils.py
@@ -119,7 +119,7 @@ def test_fetch_requirements(self):
             'gitpython==2.1.11',
             'ose-timer==0.7.5',
             'oslo.config<1.13,>=1.12.1',
-            'requests[security]<2.23.0,>=2.22.0',
+            'requests[security]<2.22.0,>=2.21.0',
             'retrying==1.3.3',
             'zake==0.2.2'
         ]

From cdb7dbddd9827c49db6fa26331c12a701a787552 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 15:34:25 -0700
Subject: [PATCH 06/13] Update six to 1.12.0

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 85c495849e..553c300330 100644
--- a/Makefile
+++ b/Makefile
@@ -455,7 +455,7 @@ requirements: virtualenv .sdist-requirements install-runners
 	done
 
 	# Fix for Travis CI race
-	$(VIRTUALENV_DIR)/bin/pip install "six==1.11.0"
+	$(VIRTUALENV_DIR)/bin/pip install "six==1.12.0"
 
 	# Fix for Travis CI caching issue
 	$(VIRTUALENV_DIR)/bin/pip uninstall -y "pytz" || echo "not installed"

From 60c2d632b2bf38c0cb3ba81a878847ae7d029c1c Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 16:30:01 -0700
Subject: [PATCH 07/13] Don't uninstall python-dateutil if we aren't on Travis

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 553c300330..d1f28a3aed 100644
--- a/Makefile
+++ b/Makefile
@@ -458,9 +458,11 @@ requirements: virtualenv .sdist-requirements install-runners
 	$(VIRTUALENV_DIR)/bin/pip install "six==1.12.0"
 
 	# Fix for Travis CI caching issue
-	$(VIRTUALENV_DIR)/bin/pip uninstall -y "pytz" || echo "not installed"
-	$(VIRTUALENV_DIR)/bin/pip uninstall -y "python-dateutil" || echo "not installed"
-	$(VIRTUALENV_DIR)/bin/pip uninstall -y "orquesta" || echo "not installed"
+	if [[ "$(TRAVIS_EVENT_TYPE)" != "" ]]; then\
+		$(VIRTUALENV_DIR)/bin/pip uninstall -y "pytz" || echo "not installed"; \
+		$(VIRTUALENV_DIR)/bin/pip uninstall -y "python-dateutil" || echo "not installed"; \
+		$(VIRTUALENV_DIR)/bin/pip uninstall -y "orquesta" || echo "not installed"; \
+	fi
 
 	# Install requirements
 	#

From 8edd7bd0d772a74ecce32b12e84b916bd54cc618 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 16:54:53 -0700
Subject: [PATCH 08/13] Update headers on dist_utils.py files

---
 contrib/runners/action_chain_runner/dist_utils.py | 2 ++
 contrib/runners/announcement_runner/dist_utils.py | 2 ++
 contrib/runners/http_runner/dist_utils.py         | 2 ++
 contrib/runners/inquirer_runner/dist_utils.py     | 2 ++
 contrib/runners/local_runner/dist_utils.py        | 2 ++
 contrib/runners/mistral_v2/dist_utils.py          | 2 ++
 contrib/runners/noop_runner/dist_utils.py         | 2 ++
 contrib/runners/orquesta_runner/dist_utils.py     | 2 ++
 contrib/runners/python_runner/dist_utils.py       | 2 ++
 contrib/runners/remote_runner/dist_utils.py       | 2 ++
 contrib/runners/winrm_runner/dist_utils.py        | 2 ++
 st2actions/dist_utils.py                          | 2 ++
 st2api/dist_utils.py                              | 2 ++
 st2auth/dist_utils.py                             | 2 ++
 st2client/dist_utils.py                           | 2 ++
 st2common/dist_utils.py                           | 2 ++
 st2debug/dist_utils.py                            | 2 ++
 st2exporter/dist_utils.py                         | 2 ++
 st2reactor/dist_utils.py                          | 2 ++
 st2stream/dist_utils.py                           | 2 ++
 st2tests/dist_utils.py                            | 2 ++
 21 files changed, 42 insertions(+)

diff --git a/contrib/runners/action_chain_runner/dist_utils.py b/contrib/runners/action_chain_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/action_chain_runner/dist_utils.py
+++ b/contrib/runners/action_chain_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/announcement_runner/dist_utils.py b/contrib/runners/announcement_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/announcement_runner/dist_utils.py
+++ b/contrib/runners/announcement_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/http_runner/dist_utils.py b/contrib/runners/http_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/http_runner/dist_utils.py
+++ b/contrib/runners/http_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/inquirer_runner/dist_utils.py b/contrib/runners/inquirer_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/inquirer_runner/dist_utils.py
+++ b/contrib/runners/inquirer_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/local_runner/dist_utils.py b/contrib/runners/local_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/local_runner/dist_utils.py
+++ b/contrib/runners/local_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/mistral_v2/dist_utils.py b/contrib/runners/mistral_v2/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/mistral_v2/dist_utils.py
+++ b/contrib/runners/mistral_v2/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/noop_runner/dist_utils.py b/contrib/runners/noop_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/noop_runner/dist_utils.py
+++ b/contrib/runners/noop_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/orquesta_runner/dist_utils.py b/contrib/runners/orquesta_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/orquesta_runner/dist_utils.py
+++ b/contrib/runners/orquesta_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/python_runner/dist_utils.py b/contrib/runners/python_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/python_runner/dist_utils.py
+++ b/contrib/runners/python_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/remote_runner/dist_utils.py b/contrib/runners/remote_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/remote_runner/dist_utils.py
+++ b/contrib/runners/remote_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/contrib/runners/winrm_runner/dist_utils.py b/contrib/runners/winrm_runner/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/contrib/runners/winrm_runner/dist_utils.py
+++ b/contrib/runners/winrm_runner/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2actions/dist_utils.py b/st2actions/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2actions/dist_utils.py
+++ b/st2actions/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2api/dist_utils.py b/st2api/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2api/dist_utils.py
+++ b/st2api/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2auth/dist_utils.py b/st2auth/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2auth/dist_utils.py
+++ b/st2auth/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2client/dist_utils.py b/st2client/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2client/dist_utils.py
+++ b/st2client/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2common/dist_utils.py b/st2common/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2common/dist_utils.py
+++ b/st2common/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2debug/dist_utils.py b/st2debug/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2debug/dist_utils.py
+++ b/st2debug/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2exporter/dist_utils.py b/st2exporter/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2exporter/dist_utils.py
+++ b/st2exporter/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2reactor/dist_utils.py b/st2reactor/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2reactor/dist_utils.py
+++ b/st2reactor/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2stream/dist_utils.py b/st2stream/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2stream/dist_utils.py
+++ b/st2stream/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #
diff --git a/st2tests/dist_utils.py b/st2tests/dist_utils.py
index 140a1fe630..2d4e1a2a7f 100644
--- a/st2tests/dist_utils.py
+++ b/st2tests/dist_utils.py
@@ -1,4 +1,6 @@
 # NOTE: This file is auto-generated - DO NOT EDIT MANUALLY
+#       Instead modify scripts/dist_utils.py and run 'make .sdist-requirements' to
+#       update dist_utils.py files for all components
 # -*- coding: utf-8 -*-
 # Copyright 2019 Extreme Networks, Inc.
 #

From f3bbc15068c24d80fd03064780363ee6025e28d1 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 20:57:30 -0700
Subject: [PATCH 09/13] Betterize requirements header

---
 scripts/fixate-requirements.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/fixate-requirements.py b/scripts/fixate-requirements.py
index b5c1ec206f..3e712bc9c7 100755
--- a/scripts/fixate-requirements.py
+++ b/scripts/fixate-requirements.py
@@ -183,6 +183,12 @@ def write_requirements(sources=None, fixed_requirements=None, output_file=None,
     data = '\n'.join(lines_to_write) + '\n'
     with open(output_file, 'w') as fp:
         fp.write('# Don\'t edit this file. It\'s generated automatically!\n')
+        fp.write('# If you want to update global dependencies, modify fixed-requirements.txt\n')
+        fp.write('# and then run \'make requirements\' to update requirements.txt for all\n')
+        fp.write('# components.\n')
+        fp.write('# If you want to update depdencies for a single component, modify the\n')
+        fp.write('# in-requirements.txt for that component and then run \'make requirements\' to\n')
+        fp.write('# update the component requirements.txt\n')
         fp.write(data)
 
     print('Requirements written to: {0}'.format(output_file))

From 4a0e8a11ef47da735c7c858520c883d10b9ef8fc Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Tue, 20 Aug 2019 16:59:48 -0700
Subject: [PATCH 10/13] Update all requirements files with the new (better)
 header

---
 contrib/runners/action_chain_runner/requirements.txt |  6 ++++++
 contrib/runners/announcement_runner/requirements.txt |  6 ++++++
 contrib/runners/http_runner/requirements.txt         |  6 ++++++
 contrib/runners/inquirer_runner/requirements.txt     |  6 ++++++
 contrib/runners/local_runner/requirements.txt        |  6 ++++++
 contrib/runners/mistral_v2/requirements.txt          |  6 ++++++
 contrib/runners/noop_runner/requirements.txt         |  6 ++++++
 contrib/runners/orquesta_runner/requirements.txt     |  6 ++++++
 contrib/runners/python_runner/requirements.txt       |  6 ++++++
 contrib/runners/remote_runner/requirements.txt       |  6 ++++++
 contrib/runners/winrm_runner/requirements.txt        |  6 ++++++
 requirements.txt                                     | 10 ++++++++--
 st2actions/requirements.txt                          |  8 +++++++-
 st2api/requirements.txt                              |  6 ++++++
 st2auth/requirements.txt                             |  6 ++++++
 st2client/requirements.txt                           |  8 +++++++-
 st2common/requirements.txt                           | 10 ++++++++--
 st2debug/requirements.txt                            |  8 +++++++-
 st2exporter/requirements.txt                         |  6 ++++++
 st2reactor/requirements.txt                          |  6 ++++++
 st2stream/requirements.txt                           |  6 ++++++
 st2tests/requirements.txt                            |  6 ++++++
 22 files changed, 139 insertions(+), 7 deletions(-)

diff --git a/contrib/runners/action_chain_runner/requirements.txt b/contrib/runners/action_chain_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/action_chain_runner/requirements.txt
+++ b/contrib/runners/action_chain_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/announcement_runner/requirements.txt b/contrib/runners/announcement_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/announcement_runner/requirements.txt
+++ b/contrib/runners/announcement_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/http_runner/requirements.txt b/contrib/runners/http_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/http_runner/requirements.txt
+++ b/contrib/runners/http_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/inquirer_runner/requirements.txt b/contrib/runners/inquirer_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/inquirer_runner/requirements.txt
+++ b/contrib/runners/inquirer_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/local_runner/requirements.txt b/contrib/runners/local_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/local_runner/requirements.txt
+++ b/contrib/runners/local_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/mistral_v2/requirements.txt b/contrib/runners/mistral_v2/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/mistral_v2/requirements.txt
+++ b/contrib/runners/mistral_v2/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/noop_runner/requirements.txt b/contrib/runners/noop_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/noop_runner/requirements.txt
+++ b/contrib/runners/noop_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/orquesta_runner/requirements.txt b/contrib/runners/orquesta_runner/requirements.txt
index 80f6ebf367..a276ce5d95 100644
--- a/contrib/runners/orquesta_runner/requirements.txt
+++ b/contrib/runners/orquesta_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 git+https://github.com/StackStorm/orquesta.git@e6ebbbeb2c661486067e659dc7552f0a986603a6#egg=orquesta
diff --git a/contrib/runners/python_runner/requirements.txt b/contrib/runners/python_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/python_runner/requirements.txt
+++ b/contrib/runners/python_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/remote_runner/requirements.txt b/contrib/runners/remote_runner/requirements.txt
index b4be240ac2..f4a1c5a5ee 100644
--- a/contrib/runners/remote_runner/requirements.txt
+++ b/contrib/runners/remote_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 
diff --git a/contrib/runners/winrm_runner/requirements.txt b/contrib/runners/winrm_runner/requirements.txt
index 8fa65d3a82..80869b32c6 100644
--- a/contrib/runners/winrm_runner/requirements.txt
+++ b/contrib/runners/winrm_runner/requirements.txt
@@ -1,2 +1,8 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 pywinrm==0.3.0
diff --git a/requirements.txt b/requirements.txt
index 755c12b03e..78888a50ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,12 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 RandomWords
-amqp==2.5.0
+amqp==2.5.1
 apscheduler==3.6.1
 argcomplete
 bcrypt==3.1.7
@@ -45,7 +51,7 @@ pytz==2019.1
 pywinrm==0.3.0
 pyyaml==5.1.2
 rednose
-requests[security]<2.23.0,>=2.22.0
+requests[security]<2.22.0,>=2.21.0
 retrying==1.3.3
 routes==2.4.1
 semver==2.8.1
diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt
index f0995e922a..2cf00ac2fd 100755
--- a/st2actions/requirements.txt
+++ b/st2actions/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 apscheduler==3.6.1
 eventlet==0.25.0
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
@@ -13,5 +19,5 @@ pyinotify==0.9.6
 python-dateutil==2.8.0
 python-json-logger
 pyyaml==5.1.2
-requests[security]<2.23.0,>=2.22.0
+requests[security]<2.22.0,>=2.21.0
 six==1.12.0
diff --git a/st2api/requirements.txt b/st2api/requirements.txt
index b791bcf92a..624995c619 100644
--- a/st2api/requirements.txt
+++ b/st2api/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 eventlet==0.25.0
 git+https://github.com/StackStorm/python-mistralclient#egg=python-mistralclient
 gunicorn==19.9.0
diff --git a/st2auth/requirements.txt b/st2auth/requirements.txt
index b8a40a0e99..12091715d5 100644
--- a/st2auth/requirements.txt
+++ b/st2auth/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 bcrypt==3.1.7
 eventlet==0.25.0
 git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
diff --git a/st2client/requirements.txt b/st2client/requirements.txt
index f7a2ba074b..d46f47ecb2 100644
--- a/st2client/requirements.txt
+++ b/st2client/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 argcomplete
 cryptography==2.7
 jsonpath-rw==1.4.0
@@ -9,6 +15,6 @@ python-dateutil==2.8.0
 python-editor==1.0.4
 pytz==2019.1
 pyyaml==5.1.2
-requests[security]<2.23.0,>=2.22.0
+requests[security]<2.22.0,>=2.21.0
 six==1.12.0
 sseclient-py==1.7
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
index ecadc3a41e..d2e5ffd18d 100644
--- a/st2common/requirements.txt
+++ b/st2common/requirements.txt
@@ -1,5 +1,11 @@
 # Don't edit this file. It's generated automatically!
-amqp==2.5.0
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
+amqp==2.5.1
 apscheduler==3.6.1
 cryptography==2.7
 eventlet==0.25.0
@@ -21,7 +27,7 @@ pymongo==3.7.2
 python-dateutil==2.8.0
 python-statsd==2.1.0
 pyyaml==5.1.2
-requests[security]<2.23.0,>=2.22.0
+requests[security]<2.22.0,>=2.21.0
 retrying==1.3.3
 routes==2.4.1
 semver==2.8.1
diff --git a/st2debug/requirements.txt b/st2debug/requirements.txt
index 4e0f521ecf..6c490b266c 100644
--- a/st2debug/requirements.txt
+++ b/st2debug/requirements.txt
@@ -1,6 +1,12 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 eventlet==0.25.0
 python-gnupg==0.4.5
 pyyaml==5.1.2
-requests[security]<2.23.0,>=2.22.0
+requests[security]<2.22.0,>=2.21.0
 six==1.12.0
diff --git a/st2exporter/requirements.txt b/st2exporter/requirements.txt
index b23198e559..305d296e33 100644
--- a/st2exporter/requirements.txt
+++ b/st2exporter/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 eventlet==0.25.0
 kombu==4.6.4
 oslo.config<1.13,>=1.12.1
diff --git a/st2reactor/requirements.txt b/st2reactor/requirements.txt
index 9897717edb..961e08919a 100644
--- a/st2reactor/requirements.txt
+++ b/st2reactor/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 apscheduler==3.6.1
 eventlet==0.25.0
 jsonpath-rw==1.4.0
diff --git a/st2stream/requirements.txt b/st2stream/requirements.txt
index 7272fe4b0e..f1ad198c45 100644
--- a/st2stream/requirements.txt
+++ b/st2stream/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 eventlet==0.25.0
 gunicorn==19.9.0
 jsonschema==2.6.0
diff --git a/st2tests/requirements.txt b/st2tests/requirements.txt
index 3d78725c35..c11f1b4bc3 100644
--- a/st2tests/requirements.txt
+++ b/st2tests/requirements.txt
@@ -1,4 +1,10 @@
 # Don't edit this file. It's generated automatically!
+# If you want to update global dependencies, modify fixed-requirements.txt
+# and then run 'make requirements' to update requirements.txt for all
+# components.
+# If you want to update depdencies for a single component, modify the
+# in-requirements.txt for that component and then run 'make requirements' to
+# update the component requirements.txt
 RandomWords
 mock==2.0.0
 nose

From 62c67bab783d105da3aa7ab95579ced4362f498e Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Thu, 22 Aug 2019 10:32:05 -0700
Subject: [PATCH 11/13] [skip ci] Add changelog entries

---
 CHANGELOG.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7080b72c6c..5b396d909a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,7 @@ Added
 Changed
 ~~~~~~~
 
+* Improved instructions in requirements.txt and dist_utils.py comment headers (improvement) #4774
 * Install pack with the latest tag version if it exists when branch is not specialized.
   (improvement) #4743
 * Implement "continue" engine command to orquesta workflow. (improvement) #4740
@@ -42,6 +43,8 @@ Fixed
   Contributed by JP Bourget (@punkrokk Syncurity) #4732
 * Update ``dist_utils`` module which is bundled with ``st2client`` and other Python packages so it
   doesn't depend on internal pip API and so it works with latest pip version. (bug fix) #4750
+* Fix dependency conflicts in pack CI runs: downgrade requests dependency back to 0.21.0, update
+  internal dependencies (amqp, pyyaml, prance, six) (bugfix) #4774
 
 3.1.0 - June 27, 2019
 ---------------------

From 7c3a73d84a3ebd6a1553f850692f6650ea4d69a2 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Thu, 22 Aug 2019 13:15:09 -0700
Subject: [PATCH 12/13] Tweak changelog to kick CI

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5b396d909a..0edba017c3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -44,7 +44,7 @@ Fixed
 * Update ``dist_utils`` module which is bundled with ``st2client`` and other Python packages so it
   doesn't depend on internal pip API and so it works with latest pip version. (bug fix) #4750
 * Fix dependency conflicts in pack CI runs: downgrade requests dependency back to 0.21.0, update
-  internal dependencies (amqp, pyyaml, prance, six) (bugfix) #4774
+  internal dependencies and test expectations (amqp, pyyaml, prance, six) (bugfix) #4774
 
 3.1.0 - June 27, 2019
 ---------------------

From b702eca90f9281eeb7756cc687c280a7599fe481 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Thu, 22 Aug 2019 15:32:06 -0700
Subject: [PATCH 13/13] Make changelog ordering consistent

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0edba017c3..010c57e370 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,7 +14,6 @@ Added
 Changed
 ~~~~~~~
 
-* Improved instructions in requirements.txt and dist_utils.py comment headers (improvement) #4774
 * Install pack with the latest tag version if it exists when branch is not specialized.
   (improvement) #4743
 * Implement "continue" engine command to orquesta workflow. (improvement) #4740
@@ -23,6 +22,8 @@ Changed
 
   Latest version of mongoengine should show some performance improvements (5-20%) when
   writing very large executions (executions with large results) to the database. #4767
+* Improved development instructions in requirements.txt and dist_utils.py comment headers
+  (improvement) #4774
 
 Fixed
 ~~~~~