From 50ce010212504ad24fbd46dd01d0e94bad0f940b Mon Sep 17 00:00:00 2001
From: Joe Moore <jpvlsmv@gmail.com>
Date: Sat, 30 May 2020 09:33:35 -0400
Subject: [PATCH 1/4] Move flake8 to a separate tox env

---
 tox.ini | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 17df046d..c5174915 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38
+envlist = style,py36,py37,py38
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -10,12 +10,15 @@ setenv =
     PYTHON="{envpython}"
 commands =
     make modules
-    flake8
     py.test core hscommon
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements-extra.txt
 
+[testenv:style]
+commands =
+    flake8
+
 [testenv:WINDOWS]
 deps =
     {[testenv]deps}

From dffbed8e228fcb5fcacd46dca0bc6478e7a0af2f Mon Sep 17 00:00:00 2001
From: Joe Moore <jpvlsmv@gmail.com>
Date: Sat, 30 May 2020 09:34:03 -0400
Subject: [PATCH 2/4] Use build and package scripts on windows

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

diff --git a/tox.ini b/tox.ini
index c5174915..e6abb9fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,9 @@ commands =
 deps =
     {[testenv]deps}
     -r{toxinidir}/requirements-windows.txt
+commands =
+    python build.py
+    python package.py
 
 [flake8]
 exclude = .tox,env,build,hscommon/tests,cocoalib,cocoa,help,./qt/dg_rc.py,qt/run_template.py,cocoa/run_template.py,./run.py,./pkg

From ccb1c75f22d8f54b7bb2ceed445d2e0348bec3ae Mon Sep 17 00:00:00 2001
From: Joe Moore <jpvlsmv@gmail.com>
Date: Sat, 30 May 2020 09:40:23 -0400
Subject: [PATCH 3/4] Call style-checker tox environment

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

diff --git a/.travis.yml b/.travis.yml
index b89e7532..7cde9668 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ install:
 script: tox
 matrix:
         include:
+                - os: "linux"
+                  dist: "xenial"
+                  python: "3.8"
+                  script:
+                        - tox -e style
                 - os: "linux"
                   dist: "xenial"
                   python: "3.6"

From d15dea7aa0154b2950af067b1e367ebe66fe0007 Mon Sep 17 00:00:00 2001
From: Joe Moore <jpvlsmv@gmail.com>
Date: Sat, 30 May 2020 09:49:17 -0400
Subject: [PATCH 4/4] Move flake8 requirement out of .txt into tox environment
 spec

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

diff --git a/tox.ini b/tox.ini
index e6abb9fd..5d49c6ee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,9 @@ deps =
     -r{toxinidir}/requirements-extra.txt
 
 [testenv:style]
+deps =
+    {[testenv]deps}
+    flake8
 commands =
     flake8