From 71d85f78f04e77f4ca6e90fb31482c861cd78359 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 19 Mar 2019 16:45:11 +0100
Subject: [PATCH 1/3] Add new tox target for reformatting all the code using
 black library.

---
 tox.ini | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tox.ini b/tox.ini
index fb193b3449..c09d1f91e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,31 @@ deps = -r{toxinidir}/requirements.txt
        -e{toxinidir}/st2reactor
 
 # Python 3 tasks
+[testenv:py36-black]
+basepython = python3.6
+setenv = PYTHONPATH = {toxinidir}/external:{toxinidir}/st2common:{toxinidir}/st2api:{toxinidir}/st2actions:{toxinidir}/st2exporter:{toxinidir}/st2reactor:{toxinidir}/st2tests:{toxinidir}/contrib/runners/action_chain_runner:{toxinidir}/contrib/runners/local_runner:{toxinidir}/contrib/runners/python_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/noop_runner:{toxinidir}/contrib/runners/announcement_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/mistral_v2:{toxinidir}/contrib/runners/orquesta_runner:{toxinidir}/contrib/runners/inquirer_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/winrm_runner
+         VIRTUALENV_DIR = {envdir}
+passenv = NOSE_WITH_TIMER TRAVIS
+install_command = pip install -U --force-reinstall {opts} {packages}
+deps = virtualenv
+       -r{toxinidir}/requirements.txt
+       -e{toxinidir}/st2client
+       -e{toxinidir}/st2common
+       black
+commands =
+    black --config lint-configs/python/pyproject.toml st2api/
+    black --config lint-configs/python/pyproject.toml st2auth/
+    black --config lint-configs/python/pyproject.toml st2client/
+    black --config lint-configs/python/pyproject.toml st2common/
+    black --config lint-configs/python/pyproject.toml st2debug/
+    black --config lint-configs/python/pyproject.toml st2exporter/
+    black --config lint-configs/python/pyproject.toml st2reactor/
+    black --config lint-configs/python/pyproject.toml st2stream/
+    black --config lint-configs/python/pyproject.toml st2tests/
+    black --config lint-configs/python/pyproject.toml contrib/
+    black --config lint-configs/python/pyproject.toml tools/
+    black --config lint-configs/python/pyproject.toml scripts
+
 [testenv:py36-unit]
 basepython = python3.6
 setenv = PYTHONPATH = {toxinidir}/external:{toxinidir}/st2common:{toxinidir}/st2api:{toxinidir}/st2actions:{toxinidir}/st2exporter:{toxinidir}/st2reactor:{toxinidir}/st2tests:{toxinidir}/contrib/runners/action_chain_runner:{toxinidir}/contrib/runners/local_runner:{toxinidir}/contrib/runners/python_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/noop_runner:{toxinidir}/contrib/runners/announcement_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/mistral_v2:{toxinidir}/contrib/runners/orquesta_runner:{toxinidir}/contrib/runners/inquirer_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/winrm_runner

From bcda5df0f7d2e38289bd7f7518e35feb4b9cb66c Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 19 Mar 2019 17:03:25 +0100
Subject: [PATCH 2/3] Squashed 'lint-configs/' changes from
 e43b03a98..e0a12db78

e0a12db78 Add config for black tool.

git-subtree-dir: lint-configs
git-subtree-split: e0a12db7845471b41db5cc4231880fef44c641f2
---
 pyproject.toml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..58a02602fe
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,22 @@
+[tool.black]
+line-length = 100
+skip-string-normalization = true
+target_version = ['py27', 'py36', 'py37', 'py38']
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+  | virtualenv
+  | virtualenv-py3
+  | virtualenv-st2client
+)/
+

From a3df5f9a4d1fc3f78f9d325529225499afb94a53 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Tue, 19 Mar 2019 17:20:42 +0100
Subject: [PATCH 3/3] Squashed 'lint-configs/' changes from
 e0a12db78..41e64995b

41e64995b Add config for black tool.
REVERT: e0a12db78 Add config for black tool.

git-subtree-dir: lint-configs
git-subtree-split: 41e64995bd25c8333806aacfaebaf998017232c2
---
 pyproject.toml => python/pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename pyproject.toml => python/pyproject.toml (83%)

diff --git a/pyproject.toml b/python/pyproject.toml
similarity index 83%
rename from pyproject.toml
rename to python/pyproject.toml
index 58a02602fe..a232e186cc 100644
--- a/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 100
-skip-string-normalization = true
+skip_string_normalization = true
 target_version = ['py27', 'py36', 'py37', 'py38']
 include = '\.pyi?$'
 exclude = '''
@@ -18,5 +18,6 @@ exclude = '''
   | virtualenv
   | virtualenv-py3
   | virtualenv-st2client
+  | test_content_version
 )/