From 506670b978203513d55b77a3b143e23ccc650384 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Wed, 27 Jan 2021 23:32:49 -0600
Subject: [PATCH] Install test deps only when needed

---
 .github/workflows/mypy.yml     | 21 ---------------------
 .github/workflows/test.yml     | 19 +++++++++++++++++++
 .github/workflows/unittest.yml | 21 ---------------------
 .gitignore                     |  2 ++
 netkan/Dockerfile              |  3 ---
 netkan/setup.py                |  3 ---
 netkan/tox.ini                 |  8 ++++++++
 7 files changed, 29 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/mypy.yml
 create mode 100644 .github/workflows/test.yml
 delete mode 100644 .github/workflows/unittest.yml
 create mode 100644 netkan/tox.ini

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
deleted file mode 100644
index 2341e9a4..00000000
--- a/.github/workflows/mypy.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Mypy
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Mypy
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.7
-    - name: Install Dependencies
-      run: |
-        pip install netkan/.[test]
-    - name: mypy
-      working-directory: ./netkan
-      run: |
-        mypy .
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..afc1369e
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,19 @@
+name: Test
+
+on:
+    - push
+    - pull_request
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup Python
+              uses: actions/setup-python@v1
+              with:
+                  python-version: 3.7
+            - name: Install and run Tox
+              run: pip install tox
+            - name: Run Tox
+              run: tox -e py -c netkan
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
deleted file mode 100644
index a64e2017..00000000
--- a/.github/workflows/unittest.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: unittest
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: unittest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.7
-    - name: Install Dependencies
-      run: |
-        pip install netkan/.[test]
-    - name: Run unittest
-      working-directory: ./netkan
-      run: |
-        python -m unittest -v
diff --git a/.gitignore b/.gitignore
index 5a9c8469..a7867445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /pr_tester
 __pycache__
 .mypy_cache/
+.eggs
+.tox
diff --git a/netkan/Dockerfile b/netkan/Dockerfile
index 202ad9cd..876f4fd5 100644
--- a/netkan/Dockerfile
+++ b/netkan/Dockerfile
@@ -3,11 +3,9 @@ RUN useradd -ms /bin/bash netkan
 ADD . /netkan
 WORKDIR /netkan
 RUN pip install pip --upgrade
-RUN pip install mypy
 RUN chown -R netkan:netkan /netkan
 USER netkan
 RUN pip install --user . --no-warn-script-location --force-reinstall
-RUN mypy .
 RUN python -m unittest -v
 
 FROM python:3.7 as production
@@ -29,7 +27,6 @@ RUN chown -R netkan:netkan /netkan
 ADD run_dev.sh /usr/local/bin/
 USER netkan
 RUN pip install --user /netkan/.[development]
-RUN pip install --user /netkan/.[test]
 ENTRYPOINT ["/usr/local/bin/run_dev.sh"]
 
 FROM production
diff --git a/netkan/setup.py b/netkan/setup.py
index dc355a38..565bf388 100644
--- a/netkan/setup.py
+++ b/netkan/setup.py
@@ -38,9 +38,6 @@
             'pylint',
             'autopep8',
             'troposphere',
-        ],
-        'test': [
-            'mypy',
         ]
     },
 )
diff --git a/netkan/tox.ini b/netkan/tox.ini
new file mode 100644
index 00000000..8fa13a68
--- /dev/null
+++ b/netkan/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py
+
+[testenv]
+deps = mypy
+commands =
+    python -m unittest -v
+    mypy .