From 56a310821f2347db57687e5f391f94c11d30cd43 Mon Sep 17 00:00:00 2001
From: Mark Bonicillo <mark.bonicillo@pnnl.gov>
Date: Mon, 1 Apr 2024 13:16:42 -0700
Subject: [PATCH] Update ci.yml

---
 .github/workflows/ci.yml | 10 +++++-----
 Makefile                 |  3 ---
 pylintrc                 |  2 +-
 tox.ini                  | 11 +++++++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32918e97..db3e0bdb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
   run-tests:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
         python: ['3.8', '3.9', '3.10', '3.11']
     runs-on: ${{ matrix.os }}
 
@@ -58,13 +58,13 @@ jobs:
         virtualenvs-in-project: true
         installer-parallel: true
       #----------------------------------------------
-      # install tox
+      # install other testing dependencies
       #----------------------------------------------
-    - name: Install tox, pytest-github
-      run: poetry run pip install 'tox>=4.4.11' 'pytest-github-actions-annotate-failures>=0.1.7'
+    - name: Install tox, pytest-github, tox-gh-actions
+      run: poetry run pip install 'tox>=4.4.11' 'pytest-github-actions-annotate-failures>=0.1.7' 'tox-gh-actions'
       #----------------------------------------------
       #     Run tests, linters defined in Tox
       #----------------------------------------------
     - name: Run tests, linters
       run: |
-        poetry run make test-ci-github
+        poetry run tox
diff --git a/Makefile b/Makefile
index 043a67a2..2052079f 100644
--- a/Makefile
+++ b/Makefile
@@ -45,9 +45,6 @@ test-tox:
 ### Tests using Poetry + Tox
 ### Used by Bamboo CI Pipeline, Github Workflows CI Pipeline
 
-.PHONY: test-ci-github
-test-ci-github: run-poetry-tox
-
 .PHONY: test-ci-stash
 test-ci-stash: install-poetry-stash run-poetry-tox clean-poetry-env
 
diff --git a/pylintrc b/pylintrc
index 18f3cd61..5091de9a 100644
--- a/pylintrc
+++ b/pylintrc
@@ -1,7 +1,7 @@
 [MAIN]
 
 # Specify a score threshold to be exceeded before program exits with error.
-fail-under=7.66
+fail-under=7.26
 
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
diff --git a/tox.ini b/tox.ini
index 0136e5af..c3d79804 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@
 
 [tox]
 min_version = 4.4.11
+isolated_build = True
+skip_missing_interpreters = true
 envlist =
     lint
     notebooks-test
@@ -12,8 +14,13 @@ envlist =
     py39
     py310
     py311
-isolated_build = True
-skip_missing_interpreters = true
+
+[gh-actions]
+python =
+    3.8: py38
+    3.9: py39
+    3.10: py310
+    3.11: py311, lint, notebooks-test
 
 [testenv]
 description = run tests