From 1fff8e893c628060dd9e946bbf0bc497a25bfcc4 Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@dominionrnd.com>
Date: Wed, 18 Dec 2024 06:03:32 -0700
Subject: [PATCH] Update CI

---
 .github/workflows/main.yml | 15 +++++----------
 GNUmakefile                |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2875bd3..ba807cb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,23 +19,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, 3.10, 3.11, 3.12, 3.x, pypy3]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.x", "pypy3"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@master
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@master
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install wheel
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        pip install flake8 pytest pytz tzlocal pymodbus pylogix
-        pip install 'argparse; python_version < "2.7"'
-        pip install 'configparser; python_version < "3.0"'
-        pip install 'ipaddress; python_version < "3.0"'
+        python3 -m pip install --upgrade pip
+        python3 -m pip install .[all,tests]
     - name: Lint with flake8
       run: |
         make analyze || true
diff --git a/GNUmakefile b/GNUmakefile
index 72ae595..dd962f9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -69,7 +69,7 @@ VENV		= $(VENV_DIR)/$(VENV_NAME)
 VENV_OPTS	=
 
 # To see all pytest output, uncomment --capture=no
-PYTESTOPTS=-vv --capture=no --log-cli-level=INFO # 25 == NORMAL 23 == DETAIL
+PYTESTOPTS=-v --capture=no --log-cli-level=25 # INFO 25 == NORMAL 23 == DETAIL
 
 PY_TEST=TZ=$(TZ) $(PY)  -m pytest $(PYTESTOPTS)
 PY2TEST=TZ=$(TZ) $(PY2) -m pytest $(PYTESTOPTS)