From 294d895422f997f6cf6003428e6cdacacfea359a Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 17:43:37 +0200
Subject: [PATCH 01/19] Include requirements.txt files for all the Python
 packages.

This way Python packages are valid and can be re-used from other places.
---
 .gitignore                   |  2 --
 st2actions/requirements.txt  | 17 +++++++++++++++++
 st2api/requirements.txt      | 11 +++++++++++
 st2auth/requirements.txt     | 10 ++++++++++
 st2debug/requirements.txt    |  6 ++++++
 st2exporter/requirements.txt |  5 +++++
 st2reactor/requirements.txt  |  9 +++++++++
 st2stream/requirements.txt   | 10 ++++++++++
 8 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100755 st2actions/requirements.txt
 create mode 100644 st2api/requirements.txt
 create mode 100644 st2auth/requirements.txt
 create mode 100644 st2debug/requirements.txt
 create mode 100644 st2exporter/requirements.txt
 create mode 100644 st2reactor/requirements.txt
 create mode 100644 st2stream/requirements.txt

diff --git a/.gitignore b/.gitignore
index e336381212..8b58924b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@
 *.sqlite
 *.swp
 *.log
-*/requirements.txt
-!st2client/requirements.txt
 .stamp*
 
 # C extensions
diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt
new file mode 100755
index 0000000000..23d109f47d
--- /dev/null
+++ b/st2actions/requirements.txt
@@ -0,0 +1,17 @@
+# Don't edit this file. It's generated automatically!
+apscheduler==3.6.0
+eventlet==0.24.1
+git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
+git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient
+gitpython==2.1.11
+jinja2==2.10.1
+kombu==4.5.0
+lockfile==0.12.2
+oslo.config<1.13,>=1.12.1
+oslo.utils<=3.37.0,>=3.36.2
+pyinotify==0.9.6
+python-dateutil==2.8.0
+python-json-logger
+pyyaml==5.1
+requests[security]<2.23.0,>=2.22.0
+six==1.12.0
diff --git a/st2api/requirements.txt b/st2api/requirements.txt
new file mode 100644
index 0000000000..4952fb5a50
--- /dev/null
+++ b/st2api/requirements.txt
@@ -0,0 +1,11 @@
+# Don't edit this file. It's generated automatically!
+eventlet==0.24.1
+git+https://github.com/StackStorm/python-mistralclient#egg=python-mistralclient
+gunicorn==19.9.0
+jsonschema==2.6.0
+kombu==4.5.0
+mongoengine==0.17.0
+oslo.config<1.13,>=1.12.1
+oslo.utils<=3.37.0,>=3.36.2
+pymongo==3.7.2
+six==1.12.0
diff --git a/st2auth/requirements.txt b/st2auth/requirements.txt
new file mode 100644
index 0000000000..0d6dd37f13
--- /dev/null
+++ b/st2auth/requirements.txt
@@ -0,0 +1,10 @@
+# Don't edit this file. It's generated automatically!
+bcrypt==3.1.6
+eventlet==0.24.1
+git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
+gunicorn==19.9.0
+oslo.config<1.13,>=1.12.1
+passlib==1.7.1
+pymongo==3.7.2
+six==1.12.0
+stevedore==1.30.1
diff --git a/st2debug/requirements.txt b/st2debug/requirements.txt
new file mode 100644
index 0000000000..36fe7ede47
--- /dev/null
+++ b/st2debug/requirements.txt
@@ -0,0 +1,6 @@
+# Don't edit this file. It's generated automatically!
+eventlet==0.24.1
+python-gnupg==0.4.4
+pyyaml==5.1
+requests[security]<2.23.0,>=2.22.0
+six==1.12.0
diff --git a/st2exporter/requirements.txt b/st2exporter/requirements.txt
new file mode 100644
index 0000000000..de84ebad0b
--- /dev/null
+++ b/st2exporter/requirements.txt
@@ -0,0 +1,5 @@
+# Don't edit this file. It's generated automatically!
+eventlet==0.24.1
+kombu==4.5.0
+oslo.config<1.13,>=1.12.1
+six==1.12.0
diff --git a/st2reactor/requirements.txt b/st2reactor/requirements.txt
new file mode 100644
index 0000000000..ef707c1a67
--- /dev/null
+++ b/st2reactor/requirements.txt
@@ -0,0 +1,9 @@
+# Don't edit this file. It's generated automatically!
+apscheduler==3.6.0
+eventlet==0.24.1
+jsonpath-rw==1.4.0
+jsonschema==2.6.0
+kombu==4.5.0
+oslo.config<1.13,>=1.12.1
+python-dateutil==2.8.0
+six==1.12.0
diff --git a/st2stream/requirements.txt b/st2stream/requirements.txt
new file mode 100644
index 0000000000..15e9de1eef
--- /dev/null
+++ b/st2stream/requirements.txt
@@ -0,0 +1,10 @@
+# Don't edit this file. It's generated automatically!
+eventlet==0.24.1
+gunicorn==19.9.0
+jsonschema==2.6.0
+kombu==4.5.0
+mongoengine==0.17.0
+oslo.config<1.13,>=1.12.1
+oslo.utils<=3.37.0,>=3.36.2
+pymongo==3.7.2
+six==1.12.0

From a9166d8b77f154802849018fa89723229c4d2977 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 17:53:39 +0200
Subject: [PATCH 02/19] Make sure all the components include __version__
 attribute.

This makes them valid Python packages.
---
 st2actions/st2actions/__init__.py | 15 +++++++++++++++
 st2api/st2api/__init__.py         | 15 +++++++++++++++
 st2auth/st2auth/__init__.py       | 15 +++++++++++++++
 st2debug/st2debug/__init__.py     | 15 +++++++++++++++
 st2reactor/st2reactor/__init__.py | 15 +++++++++++++++
 st2stream/st2stream/__init__.py   | 15 +++++++++++++++
 6 files changed, 90 insertions(+)

diff --git a/st2actions/st2actions/__init__.py b/st2actions/st2actions/__init__.py
index e69de29bb2..80eeded44a 100644
--- a/st2actions/st2actions/__init__.py
+++ b/st2actions/st2actions/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '3.2dev'
diff --git a/st2api/st2api/__init__.py b/st2api/st2api/__init__.py
index e69de29bb2..80eeded44a 100644
--- a/st2api/st2api/__init__.py
+++ b/st2api/st2api/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '3.2dev'
diff --git a/st2auth/st2auth/__init__.py b/st2auth/st2auth/__init__.py
index e69de29bb2..80eeded44a 100644
--- a/st2auth/st2auth/__init__.py
+++ b/st2auth/st2auth/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '3.2dev'
diff --git a/st2debug/st2debug/__init__.py b/st2debug/st2debug/__init__.py
index e69de29bb2..80eeded44a 100644
--- a/st2debug/st2debug/__init__.py
+++ b/st2debug/st2debug/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '3.2dev'
diff --git a/st2reactor/st2reactor/__init__.py b/st2reactor/st2reactor/__init__.py
index e69de29bb2..80eeded44a 100644
--- a/st2reactor/st2reactor/__init__.py
+++ b/st2reactor/st2reactor/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '3.2dev'
diff --git a/st2stream/st2stream/__init__.py b/st2stream/st2stream/__init__.py
index e69de29bb2..80eeded44a 100644
--- a/st2stream/st2stream/__init__.py
+++ b/st2stream/st2stream/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '3.2dev'

From 0414b6eeda9d6bacfa489358e5c3974612368065 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 18:08:45 +0200
Subject: [PATCH 03/19] Add make check which verifies that all the components
 Python packages are valid.

Run it on Travis.
---
 Makefile | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3b6f5b5fba..f6a2219afc 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ BINARIES := bin
 # All components are prefixed by st2 and not .egg-info.
 COMPONENTS := $(shell ls -a | grep ^st2 | grep -v .egg-info)
 COMPONENTS_RUNNERS := $(wildcard contrib/runners/*)
+COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests)
 
 COMPONENTS_WITH_RUNNERS := $(COMPONENTS) $(COMPONENTS_RUNNERS)
 
@@ -159,6 +160,23 @@ check-requirements: requirements
 	git status -- *requirements.txt */*requirements.txt | grep -q "nothing to commit"
 	@echo "All requirements files up-to-date!"
 
+.PHONY: check-python-packages
+check-python-packages:
+	# Make target which verifies all the components Python packages are valid
+	@echo ""
+	@echo "================== CHECK PYTHON PACKAGES ===================="
+	@echo ""
+	@for component in $(COMPONENTS_WITHOUT_ST2TESTS); do \
+		echo "==========================================================="; \
+		echo "Checking component:" $$component; \
+		echo "==========================================================="; \
+		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py --version) || break; \
+		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py sdist) || break; \
+		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps) || break; \
+		(cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || break; \
+		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py develop --uninstall) || break; \
+	done
+
 .PHONY: checklogs
 checklogs:
 	@echo
@@ -861,7 +879,7 @@ debs:
 ci: ci-checks ci-unit ci-integration ci-mistral ci-packs-tests
 
 .PHONY: ci-checks
-ci-checks: compile .generated-files-check .pylint .flake8 check-requirements .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check .st2client-install-check
+ci-checks: compile .generated-files-check .pylint .flake8 check-requirements .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check .st2client-install-check check-python-packages
 
 .PHONY: ci-py3-unit
 ci-py3-unit:

From 24492da8202e9cd4f377918814dd35c822a1f01e Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 18:31:27 +0200
Subject: [PATCH 04/19] Don't run setup.py develop steps, sdist and bdist_wheel
 steps are enough.

---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f6a2219afc..bbb1a81a01 100644
--- a/Makefile
+++ b/Makefile
@@ -171,10 +171,8 @@ check-python-packages:
 		echo "Checking component:" $$component; \
 		echo "==========================================================="; \
 		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py --version) || break; \
-		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py sdist) || break; \
-		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps) || break; \
+		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py sdist bdist_wheel) || break; \
 		(cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || break; \
-		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py develop --uninstall) || break; \
 	done
 
 .PHONY: checklogs

From 39b8a5b0e9acdb38a714e87a630030f06444c5e2 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 19:28:01 +0200
Subject: [PATCH 05/19] Exclude exporter, fail correctly on sub-shell failure.

---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index bbb1a81a01..14aae64207 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ BINARIES := bin
 # All components are prefixed by st2 and not .egg-info.
 COMPONENTS := $(shell ls -a | grep ^st2 | grep -v .egg-info)
 COMPONENTS_RUNNERS := $(wildcard contrib/runners/*)
-COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests)
+COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests | grep -v st2exporter)
 
 COMPONENTS_WITH_RUNNERS := $(COMPONENTS) $(COMPONENTS_RUNNERS)
 
@@ -170,9 +170,9 @@ check-python-packages:
 		echo "==========================================================="; \
 		echo "Checking component:" $$component; \
 		echo "==========================================================="; \
-		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py --version) || break; \
-		(cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py sdist bdist_wheel) || break; \
-		(cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || break; \
+		(set -e; cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py --version) || exit 1; \
+		(set -e; cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py sdist bdist_wheel) || exit 1; \
+		(set -e; cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || exit 1; \
 	done
 
 .PHONY: checklogs
@@ -401,7 +401,7 @@ distclean: clean
 	rm -rf $(VIRTUALENV_DIR)
 
 .PHONY: requirements
-requirements: virtualenv .sdist-requirements install-runners
+requirements: virtualenv .sdist-requirements
 	@echo
 	@echo "==================== requirements ===================="
 	@echo
@@ -774,6 +774,8 @@ packs-tests: requirements .packs-tests
 	@echo
 	@echo "==================== packs-tests ===================="
 	@echo
+	# Install st2common to register metrics drivers
+	(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
 	. $(VIRTUALENV_DIR)/bin/activate; find ${ROOT_DIR}/contrib/* -maxdepth 0 -type d -print0 | xargs -0 -I FILENAME ./st2common/bin/st2-run-pack-tests -c -t -x -p FILENAME
 
 

From 93b8251134a663bf7f3a8ac1035ba7b91c8c4316 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 19:32:11 +0200
Subject: [PATCH 06/19] Prevent cross virtualenv pollution and use dedicated
 virtualenv for components Python package checks.

---
 .gitignore |  2 ++
 Makefile   | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8b58924b69..bdb2fdc685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@ virtualenv-py3
 virtualenv-osx
 virtualenv-st2client
 virtualenv-st2client-osx
+virtualenv-components
+virtualenv-components-osx
 .venv-st2devbox
 
 # Installer logs
diff --git a/Makefile b/Makefile
index 14aae64207..fe959f651f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,11 @@ OS := $(shell uname)
 ifeq ($(OS),Darwin)
 	VIRTUALENV_DIR ?= virtualenv-osx
 	VIRTUALENV_ST2CLIENT_DIR ?= virtualenv-st2client-osx
+	VIRTUALENV_COMPONENTS_DIR ?= virtualenv-components-osx
 else
 	VIRTUALENV_DIR ?= virtualenv
 	VIRTUALENV_ST2CLIENT_DIR ?= virtualenv-st2client
+	VIRTUALENV_COMPONENTS_DIR ?= virtualenv-components
 endif
 
 PYTHON_VERSION ?= python2.7
@@ -166,6 +168,21 @@ check-python-packages:
 	@echo ""
 	@echo "================== CHECK PYTHON PACKAGES ===================="
 	@echo ""
+
+	test -f $(VIRTUALENV_COMPONENTS_DIR)/bin/activate || virtualenv --python=$(PYTHON_VERSION) --no-site-packages $(VIRTUALENV_COMPONENTS_DIR) --no-download
+
+	# Setup PYTHONPATH in bash activate script...
+	# Delete existing entries (if any)
+	sed -i '/_OLD_PYTHONPATHp/d' $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+	sed -i '/PYTHONPATH=/d' $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+	sed -i '/export PYTHONPATH/d' $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+
+	echo '_OLD_PYTHONPATH=$$PYTHONPATH' >> $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+	echo 'PYTHONPATH=${ROOT_DIR}:$(COMPONENT_PYTHONPATH)' >> $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+	echo 'export PYTHONPATH' >> $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
+	touch $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+	chmod +x $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+	
 	@for component in $(COMPONENTS_WITHOUT_ST2TESTS); do \
 		echo "==========================================================="; \
 		echo "Checking component:" $$component; \

From 76e120994c3aff15ad15571cbff7e1c39b26bbd4 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 19:36:40 +0200
Subject: [PATCH 07/19] Make check more robust - also check if import works.

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fe959f651f..433cdada29 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ BINARIES := bin
 COMPONENTS := $(shell ls -a | grep ^st2 | grep -v .egg-info)
 COMPONENTS_RUNNERS := $(wildcard contrib/runners/*)
 COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests | grep -v st2exporter)
+COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests | grep -v st2exporter)
 
 COMPONENTS_WITH_RUNNERS := $(COMPONENTS) $(COMPONENTS_RUNNERS)
 
@@ -187,8 +188,10 @@ check-python-packages:
 		echo "==========================================================="; \
 		echo "Checking component:" $$component; \
 		echo "==========================================================="; \
-		(set -e; cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py --version) || exit 1; \
-		(set -e; cd $$component; ../$(VIRTUALENV_DIR)/bin/python setup.py sdist bdist_wheel) || exit 1; \
+		(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py --version) || exit 1; \
+		(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py sdist bdist_wheel) || exit 1; \
+		(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py develop --no-deps) || exit 1; \
+		($(VIRTUALENV_COMPONENTS_DIR)/bin/python -c "import $$component") || exit 1; \
 		(set -e; cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || exit 1; \
 	done
 

From 744d2f2ec71506ab7976c336b246431d4575a28a Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 19:45:31 +0200
Subject: [PATCH 08/19] Fix a race in run_command() on timeout.

If kill_func() is called there is a possible race where run_command()
will return before kill_func() finishes and as such, process.returncode
won't be set.

This happens because kill_func is async.
---
 st2common/st2common/util/green/shell.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/st2common/st2common/util/green/shell.py b/st2common/st2common/util/green/shell.py
index dee5be3e29..c981799f87 100644
--- a/st2common/st2common/util/green/shell.py
+++ b/st2common/st2common/util/green/shell.py
@@ -127,6 +127,11 @@ def on_timeout_expired(timeout):
             # Command has timed out, kill the process and propagate the error.
             # Note: We explicitly set the returncode to indicate the timeout.
             LOG.debug('Command execution timeout reached.')
+
+            # NOTE: It's important we set returncode twice - here and below to
+            # avoid race in this function because "kill_func()" is async
+            process.returncode = TIMEOUT_EXIT_CODE
+
             if kill_func:
                 LOG.debug('Calling kill_func.')
                 kill_func(process=process)
@@ -134,8 +139,8 @@ def on_timeout_expired(timeout):
                 LOG.debug('Killing process.')
                 process.kill()
 
-            # NOTE: It's imporant to set returncode here, since call to kill()
-            # sets it and overwrites it if we set it earlier
+            # NOTE: It's imporant to set returncode here as well, since call to kill()
+            # sets it and overwrites it if we set it earlier.
             process.returncode = TIMEOUT_EXIT_CODE
 
             if read_stdout_func and read_stderr_func:

From bb3e6077c6d7162d501183561e78d495393d2e03 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 19:50:25 +0200
Subject: [PATCH 09/19] Improve comment.

---
 st2common/st2common/util/green/shell.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/st2common/st2common/util/green/shell.py b/st2common/st2common/util/green/shell.py
index c981799f87..fe286f07eb 100644
--- a/st2common/st2common/util/green/shell.py
+++ b/st2common/st2common/util/green/shell.py
@@ -128,8 +128,8 @@ def on_timeout_expired(timeout):
             # Note: We explicitly set the returncode to indicate the timeout.
             LOG.debug('Command execution timeout reached.')
 
-            # NOTE: It's important we set returncode twice - here and below to
-            # avoid race in this function because "kill_func()" is async
+            # NOTE: It's important we set returncode twice - here and below to avoid race in this
+            # function because "kill_func()" is async and "process.kill()" is not.
             process.returncode = TIMEOUT_EXIT_CODE
 
             if kill_func:
@@ -139,8 +139,8 @@ def on_timeout_expired(timeout):
                 LOG.debug('Killing process.')
                 process.kill()
 
-            # NOTE: It's imporant to set returncode here as well, since call to kill()
-            # sets it and overwrites it if we set it earlier.
+            # NOTE: It's imporant to set returncode here as well, since call to process.kill() sets
+            # it and overwrites it if we set it earlier.
             process.returncode = TIMEOUT_EXIT_CODE
 
             if read_stdout_func and read_stderr_func:

From 27370648702fd3a9359e161295479f26e101516e Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Mon, 29 Jul 2019 20:01:29 +0200
Subject: [PATCH 10/19] Revert change which was accidentaly added.

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

diff --git a/Makefile b/Makefile
index 433cdada29..a9b52034f8 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ BINARIES := bin
 COMPONENTS := $(shell ls -a | grep ^st2 | grep -v .egg-info)
 COMPONENTS_RUNNERS := $(wildcard contrib/runners/*)
 COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests | grep -v st2exporter)
-COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests | grep -v st2exporter)
 
 COMPONENTS_WITH_RUNNERS := $(COMPONENTS) $(COMPONENTS_RUNNERS)
 
@@ -421,7 +420,7 @@ distclean: clean
 	rm -rf $(VIRTUALENV_DIR)
 
 .PHONY: requirements
-requirements: virtualenv .sdist-requirements
+requirements: virtualenv .sdist-requirements install-runners
 	@echo
 	@echo "==================== requirements ===================="
 	@echo

From c919ff9b66cbb6b6fdd9699c3a9405fd206fa024 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 10:31:44 +0200
Subject: [PATCH 11/19] Update dist_utils.py so only check_pip_version()
 function relies on pip presence.

Other function don't rely on pip anymore.
---
 scripts/dist_utils.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/scripts/dist_utils.py b/scripts/dist_utils.py
index 6e9fbfcb52..c41a812ef9 100644
--- a/scripts/dist_utils.py
+++ b/scripts/dist_utils.py
@@ -31,16 +31,8 @@
 
 GET_PIP = 'curl https://bootstrap.pypa.io/get-pip.py | python'
 
-try:
-    import pip
-except ImportError as e:
-    print('Failed to import pip: %s' % (text_type(e)))
-    print('')
-    print('Download pip:\n%s' % (GET_PIP))
-    sys.exit(1)
-
-
 __all__ = [
+    'check_pip_is_installed',
     'check_pip_version',
     'fetch_requirements',
     'apply_vagrant_workaround',
@@ -49,10 +41,27 @@
 ]
 
 
+def check_pip_is_installed():
+    """
+    Ensure that pip is installed.
+    """
+    try:
+        import pip  # NOQA
+    except ImportError as e:
+        print('Failed to import pip: %s' % (text_type(e)))
+        print('')
+        print('Download pip:\n%s' % (GET_PIP))
+        sys.exit(1)
+
+
 def check_pip_version(min_version='6.0.0'):
     """
     Ensure that a minimum supported version of pip is installed.
     """
+    check_pip_is_installed()
+
+    import pip
+
     if StrictVersion(pip.__version__) < StrictVersion(min_version):
         print("Upgrade pip, your version '{0}' "
               "is outdated. Minimum required version is '{1}':\n{2}".format(pip.__version__,

From e2ae1a6d1bc7a242d2d7ddd0ba9a84373d28e51b Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 10:54:33 +0200
Subject: [PATCH 12/19] Add tests for other dist_utils functions.

---
 scripts/dist_utils.py                    |  4 ++
 st2common/tests/fixtures/version_file.py | 16 +++++++
 st2common/tests/unit/test_dist_utils.py  | 60 ++++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 st2common/tests/fixtures/version_file.py

diff --git a/scripts/dist_utils.py b/scripts/dist_utils.py
index c41a812ef9..aa3e4afdbf 100644
--- a/scripts/dist_utils.py
+++ b/scripts/dist_utils.py
@@ -53,6 +53,8 @@ def check_pip_is_installed():
         print('Download pip:\n%s' % (GET_PIP))
         sys.exit(1)
 
+    return True
+
 
 def check_pip_version(min_version='6.0.0'):
     """
@@ -69,6 +71,8 @@ def check_pip_version(min_version='6.0.0'):
                                                                             GET_PIP))
         sys.exit(1)
 
+    return True
+
 
 def fetch_requirements(requirements_file_path):
     """
diff --git a/st2common/tests/fixtures/version_file.py b/st2common/tests/fixtures/version_file.py
new file mode 100644
index 0000000000..6050b1fb20
--- /dev/null
+++ b/st2common/tests/fixtures/version_file.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 Extreme Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__version__ = '1.2.3'
diff --git a/st2common/tests/unit/test_dist_utils.py b/st2common/tests/unit/test_dist_utils.py
index 72f7aeb694..934109bcff 100644
--- a/st2common/tests/unit/test_dist_utils.py
+++ b/st2common/tests/unit/test_dist_utils.py
@@ -15,6 +15,7 @@
 import os
 import sys
 
+import mock
 import unittest2
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -23,7 +24,11 @@
 # Add scripts/ which contain main dist_utils.py to PYTHONPATH
 sys.path.insert(0, SCRIPTS_PATH)
 
+from dist_utils import check_pip_is_installed
+from dist_utils import check_pip_version
 from dist_utils import fetch_requirements
+from dist_utils import apply_vagrant_workaround
+from dist_utils import get_version_string
 from dist_utils_old import fetch_requirements as old_fetch_requirements
 
 __all__ = [
@@ -32,9 +37,64 @@
 
 REQUIREMENTS_PATH_1 = os.path.join(BASE_DIR, '../fixtures/requirements-used-for-tests.txt')
 REQUIREMENTS_PATH_2 = os.path.join(BASE_DIR, '../../../requirements.txt')
+VERSION_FILE_PATH = os.path.join(BASE_DIR, '../fixtures/version_file.py')
 
 
 class DistUtilsTestCase(unittest2.TestCase):
+    def setUp(self):
+        super(DistUtilsTestCase, self).setUp()
+
+        if 'pip'in sys.modules:
+            del sys.modules['pip']
+
+    def tearDown(self):
+        super(DistUtilsTestCase, self).tearDown()
+
+    def test_check_pip_is_installed_success(self):
+        self.assertTrue(check_pip_is_installed())
+
+    @mock.patch('sys.exit')
+    def test_check_pip_is_installed_failure(self, mock_sys_exit):
+        with mock.patch('__builtin__.__import__') as mock_import:
+            mock_import.side_effect = ImportError('not found')
+
+            self.assertEqual(mock_sys_exit.call_count, 0)
+            check_pip_is_installed()
+            self.assertEqual(mock_sys_exit.call_count, 1)
+            self.assertEqual(mock_sys_exit.call_args_list[0][0], (1,))
+
+    def test_check_pip_version_success(self):
+        self.assertTrue(check_pip_version())
+
+    @mock.patch('sys.exit')
+    def test_check_pip_version_failure(self, mock_sys_exit):
+
+        mock_pip = mock.Mock()
+        mock_pip.__version__ = '0.0.0'
+        sys.modules['pip'] = mock_pip
+
+        self.assertEqual(mock_sys_exit.call_count, 0)
+        check_pip_version()
+        self.assertEqual(mock_sys_exit.call_count, 1)
+        self.assertEqual(mock_sys_exit.call_args_list[0][0], (1,))
+
+    def test_get_version_string(self):
+        version = get_version_string(VERSION_FILE_PATH)
+        self.assertEqual(version, '1.2.3')
+
+    def test_apply_vagrant_workaround(self):
+        with mock.patch('os.link') as _:
+            os.environ['USER'] = 'stanley'
+
+            apply_vagrant_workaround()
+            self.assertTrue(os.link)
+
+        with mock.patch('os.link') as _:
+            os.environ['USER'] = 'vagrant'
+
+            apply_vagrant_workaround()
+            self.assertFalse(getattr(os, 'link', None))
+
     def test_fetch_requirements(self):
         expected_reqs = [
             'RandomWords',

From 8bb8673b5183ca17903fad1d5b41d2cf83acdc67 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 17:06:49 +0200
Subject: [PATCH 13/19] Fix test failure inder Python 3.

---
 st2common/tests/unit/test_dist_utils.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/st2common/tests/unit/test_dist_utils.py b/st2common/tests/unit/test_dist_utils.py
index 934109bcff..a436f33e02 100644
--- a/st2common/tests/unit/test_dist_utils.py
+++ b/st2common/tests/unit/test_dist_utils.py
@@ -15,6 +15,7 @@
 import os
 import sys
 
+import six
 import mock
 import unittest2
 
@@ -55,7 +56,12 @@ def test_check_pip_is_installed_success(self):
 
     @mock.patch('sys.exit')
     def test_check_pip_is_installed_failure(self, mock_sys_exit):
-        with mock.patch('__builtin__.__import__') as mock_import:
+        if six.PY3:
+            module_name = 'builtins.__import__'
+        else:
+            module_name = '__builtin__.__import__'
+
+        with mock.patch(module_name) as mock_import:
             mock_import.side_effect = ImportError('not found')
 
             self.assertEqual(mock_sys_exit.call_count, 0)

From bfb3189c94c39de0338234a61937bc69d2a7b56a Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 17:21:39 +0200
Subject: [PATCH 14/19] Run more complete checks as part of a nightly build.

---
 Makefile | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index b276abb65c..ced347127c 100644
--- a/Makefile
+++ b/Makefile
@@ -170,19 +170,22 @@ check-python-packages:
 	@echo ""
 
 	test -f $(VIRTUALENV_COMPONENTS_DIR)/bin/activate || virtualenv --python=$(PYTHON_VERSION) --no-site-packages $(VIRTUALENV_COMPONENTS_DIR) --no-download
+	@for component in $(COMPONENTS_WITHOUT_ST2TESTS); do \
+		echo "==========================================================="; \
+		echo "Checking component:" $$component; \
+		echo "==========================================================="; \
+		(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py --version) || exit 1; \
+	done
 
-	# Setup PYTHONPATH in bash activate script...
-	# Delete existing entries (if any)
-	sed -i '/_OLD_PYTHONPATHp/d' $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
-	sed -i '/PYTHONPATH=/d' $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
-	sed -i '/export PYTHONPATH/d' $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
+.PHONY: check-python-packages-nightly
+check-python-packages-nightly:
+	# NOTE: This is subset of check-python-packages target.
+	# We run more extensive and slower tests as part of the nightly build to speed up PR builds
+	@echo ""
+	@echo "================== CHECK PYTHON PACKAGES ===================="
+	@echo ""
 
-	echo '_OLD_PYTHONPATH=$$PYTHONPATH' >> $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
-	echo 'PYTHONPATH=${ROOT_DIR}:$(COMPONENT_PYTHONPATH)' >> $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
-	echo 'export PYTHONPATH' >> $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
-	touch $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
-	chmod +x $(VIRTUALENV_COMPONENTS_DIR)/bin/activate
-	
+	test -f $(VIRTUALENV_COMPONENTS_DIR)/bin/activate || virtualenv --python=$(PYTHON_VERSION) --no-site-packages $(VIRTUALENV_COMPONENTS_DIR) --no-download
 	@for component in $(COMPONENTS_WITHOUT_ST2TESTS); do \
 		echo "==========================================================="; \
 		echo "Checking component:" $$component; \

From e7df5c0543721f06f3ae297ae686181bff5fc1ce Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 17:33:31 +0200
Subject: [PATCH 15/19] Configure nightly build in travis config.

We run additional ci-checks-nightly as part of a nightly (cron) build.
---
 .travis.yml | 4 +++-
 Makefile    | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2d48e58027..422d042c40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,6 +133,8 @@ script:
   # NOTE: We enable code coverage and per test timing information on master so build can take twice
   # as long as PR builds
   - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
+  # Run any additional nightly checks only as part of a nightly (cron) build
+  - if [ "${TRAVIS_EVENT_TYPE}" = "cron" ] && [ "${TASK}" = "ci-checks ci-packs-tests" ]; then make ci-checks-nightly fi
   # NOTE: We only generate and submit coverage report for master and version branches
   # NOTE: We put this here and not after_success so build is marked as failed if this step fails
   # See https://docs.travis-ci.com/user/customizing-the-build/#breaking-the-build
@@ -143,4 +145,4 @@ script:
 # See: https://docs.travis-ci.com/user/caching/#Pull-request-builds-and-caches
 # Alternative: use strict pip pinning, including git-based pip packages
 before_cache:
-  - if [ ${TRAVIS_PULL_REQUEST} = 'false' ]; then rm -rf virtualenv/; fi
+  - if [ ${TRAVIS_PULL_REQUEST} = 'false' ] && [ "${TRAVIS_EVENT_TYPE}" != "cron" ]; then rm -rf virtualenv/; fi
diff --git a/Makefile b/Makefile
index ced347127c..113ef3bfcc 100644
--- a/Makefile
+++ b/Makefile
@@ -197,6 +197,9 @@ check-python-packages-nightly:
 		(set -e; cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || exit 1; \
 	done
 
+.PHONY: ci-checks-nightly
+ci-checks-nightly: check-python-packages-nightly
+
 .PHONY: checklogs
 checklogs:
 	@echo

From bc227856ec4baba9118e0eddbba832db8f0d67e4 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 17:47:28 +0200
Subject: [PATCH 16/19] Don't enable coverage for nightly builds since it's
 redundant because it already runs as part of every master merge build.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 422d042c40..c5f2a2e52c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ env:
   global:
     # NOTE: We only enable coverage for master builds and not pull requests
     # since it has huge performance overhead (etests are 50% or so slower)
-    - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no")
+    - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_EVENT_TYPE}" != "cron" ] && echo "yes" || echo "no")
     # We need to explicitly specify terminal width otherwise some CLI tests fail on container
     # environments where small terminal size is used.
     - COLUMNS=120
@@ -132,7 +132,7 @@ script:
   # Clean up egg-info directories which get created when installing runners
   # NOTE: We enable code coverage and per test timing information on master so build can take twice
   # as long as PR builds
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
+  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_EVENT_TYPE}" != "cron" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
   # Run any additional nightly checks only as part of a nightly (cron) build
   - if [ "${TRAVIS_EVENT_TYPE}" = "cron" ] && [ "${TASK}" = "ci-checks ci-packs-tests" ]; then make ci-checks-nightly fi
   # NOTE: We only generate and submit coverage report for master and version branches

From 97facf6b3e98c416afcaeca073aee1c4d73acad2 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 18:04:55 +0200
Subject: [PATCH 17/19] As part of make play, also print value of
 travis_event_type env variable.

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 113ef3bfcc..08fec2c261 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,8 @@ play:
 	@echo
 	@echo TRAVIS_PULL_REQUEST=$(TRAVIS_PULL_REQUEST)
 	@echo
+	@echo TRAVIS_EVENT_TYPE=$(TRAVIS_EVENT_TYPE)
+	@echo
 	@echo NOSE_OPTS=$(NOSE_OPTS)
 	@echo
 	@echo ENABLE_COVERAGE=$(ENABLE_COVERAGE)

From a38ef101aec22b5c8607238fcea0b3d850d16879 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 18:08:25 +0200
Subject: [PATCH 18/19] Make travis config more readable by introducing
 IS_NIGHTLY_BUILD env variable.

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5f2a2e52c..e2ccc901fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,16 +12,17 @@ branches:
 
 env:
   global:
+    - IS_NIGHTLY_BUILD=$([ "${TRAVIS_EVENT_TYPE}" = "cron" ] && echo "yes" || echo "no")
     # NOTE: We only enable coverage for master builds and not pull requests
-    # since it has huge performance overhead (etests are 50% or so slower)
-    - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_EVENT_TYPE}" != "cron" ] && echo "yes" || echo "no")
+    # since it has huge performance overhead (tests are 50% or so slower)
+    - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${IS_NIGHTLY_BUILD}" = "no" ] && echo "yes" || echo "no")
     # We need to explicitly specify terminal width otherwise some CLI tests fail on container
     # environments where small terminal size is used.
     - COLUMNS=120
     - PYLINT_CONCURRENCY=2
     # We only run tests with "--with-timer" flag on master and not for PRs since it adds 1-2
     # # minutes of overhead to each build.
-    - NOSE_TIME=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no")
+    - NOSE_TIME=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${IS_NIGHTLY_BUILD}" = "no" ] && echo "yes" || echo "no")
 matrix:
   include:
     # NOTE: We combine builds because Travis offers a maximum of 5 concurrent
@@ -132,9 +133,9 @@ script:
   # Clean up egg-info directories which get created when installing runners
   # NOTE: We enable code coverage and per test timing information on master so build can take twice
   # as long as PR builds
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_EVENT_TYPE}" != "cron" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
+  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${IS_NIGHTLY_BUILD}" = "no" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
   # Run any additional nightly checks only as part of a nightly (cron) build
-  - if [ "${TRAVIS_EVENT_TYPE}" = "cron" ] && [ "${TASK}" = "ci-checks ci-packs-tests" ]; then make ci-checks-nightly fi
+  - if [ "${IS_NIGHTLY_BUILD}" = "yes" ] && [ "${TASK}" = "ci-checks ci-packs-tests" ]; then make ci-checks-nightly; fi
   # NOTE: We only generate and submit coverage report for master and version branches
   # NOTE: We put this here and not after_success so build is marked as failed if this step fails
   # See https://docs.travis-ci.com/user/customizing-the-build/#breaking-the-build
@@ -145,4 +146,4 @@ script:
 # See: https://docs.travis-ci.com/user/caching/#Pull-request-builds-and-caches
 # Alternative: use strict pip pinning, including git-based pip packages
 before_cache:
-  - if [ ${TRAVIS_PULL_REQUEST} = 'false' ] && [ "${TRAVIS_EVENT_TYPE}" != "cron" ]; then rm -rf virtualenv/; fi
+  - if [ ${TRAVIS_PULL_REQUEST} = 'false' ] && [ "${IS_NIGHTLY_BUILD}" = "no" ]; then rm -rf virtualenv/; fi

From fdf5e96747659ea89bee2752dd0fffb6a3a7b98a Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 30 Jul 2019 18:38:43 +0200
Subject: [PATCH 19/19] Test a nightly build.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e2ccc901fa..a2256623f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ branches:
 
 env:
   global:
+    - TRAVIS_EVENT_TYPE=cron
     - IS_NIGHTLY_BUILD=$([ "${TRAVIS_EVENT_TYPE}" = "cron" ] && echo "yes" || echo "no")
     # NOTE: We only enable coverage for master builds and not pull requests
     # since it has huge performance overhead (tests are 50% or so slower)