From dd239acb401a52b630d4a21e29274d67aed56e0c Mon Sep 17 00:00:00 2001
From: bknueven <30801372+bknueven@users.noreply.github.com>
Date: Mon, 6 Mar 2023 11:09:37 -0700
Subject: [PATCH 1/4] Add Python 3.10 & 3.11 to CI

---
 .github/workflows/egret.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/egret.yml b/.github/workflows/egret.yml
index d9416bec..61721487 100644
--- a/.github/workflows/egret.yml
+++ b/.github/workflows/egret.yml
@@ -28,7 +28,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-20.04]
-                python-version: [3.7, 3.8, 3.9]
+                python-version: [3.7, 3.8, 3.9, '3.10', '3.11']
                 pyomo-version: [6.4.0]
                 include:
                     - os: macos-latest

From ae18a9b71b61379394cbe8bd4564d403f1d273eb Mon Sep 17 00:00:00 2001
From: bknueven <30801372+bknueven@users.noreply.github.com>
Date: Mon, 6 Mar 2023 11:18:48 -0700
Subject: [PATCH 2/4] Use pytest instead of nose

---
 .github/workflows/egret.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/egret.yml b/.github/workflows/egret.yml
index 61721487..7b46ddd2 100644
--- a/.github/workflows/egret.yml
+++ b/.github/workflows/egret.yml
@@ -85,9 +85,9 @@ jobs:
                 echo "$SOLVER_DIR"
                 ls -l $SOLVER_DIR
               fi
-          - name: Install Nose/Parameterized/Pytest
+          - name: Install Parameterized/Pytest
             run: |
-              pip install nose parameterized pytest coveralls
+              pip install parameterized pytest coveralls
           - name: Install Pyomo
             run: |
               pip install git+https://github.com/Pyomo/pyomo.git@${{ matrix.pyomo-version }}
@@ -96,4 +96,4 @@ jobs:
               pip install -e .
           - name: Run EGRET Tests
             run: |
-              nosetests -v --nologcapture --with-coverage --cover-package=egret egret 
+              pytest -v --cov=egret egret 

From f77e23ea729fd5c5ebed0ec1f7dcaaf18fb58003 Mon Sep 17 00:00:00 2001
From: bknueven <30801372+bknueven@users.noreply.github.com>
Date: Mon, 6 Mar 2023 11:24:51 -0700
Subject: [PATCH 3/4] remove coverage (for now)

---
 .github/workflows/egret.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/egret.yml b/.github/workflows/egret.yml
index 7b46ddd2..68948e00 100644
--- a/.github/workflows/egret.yml
+++ b/.github/workflows/egret.yml
@@ -96,4 +96,4 @@ jobs:
               pip install -e .
           - name: Run EGRET Tests
             run: |
-              pytest -v --cov=egret egret 
+              pytest -v egret 

From 1e1ae51b5c030eabba2991e0b6a03ec0f983a205 Mon Sep 17 00:00:00 2001
From: bknueven <30801372+bknueven@users.noreply.github.com>
Date: Mon, 6 Mar 2023 11:31:49 -0700
Subject: [PATCH 4/4] Need Pyomo 6.4.3 for Python 3.11

---
 .github/workflows/egret.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/egret.yml b/.github/workflows/egret.yml
index 68948e00..044ef433 100644
--- a/.github/workflows/egret.yml
+++ b/.github/workflows/egret.yml
@@ -28,7 +28,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-20.04]
-                python-version: [3.7, 3.8, 3.9, '3.10', '3.11']
+                python-version: [3.7, 3.8, 3.9, '3.10']
                 pyomo-version: [6.4.0]
                 include:
                     - os: macos-latest
@@ -40,6 +40,9 @@ jobs:
                     - os: ubuntu-20.04
                       python-version: 3.7
                       pyomo-version: main
+                    - os: ubuntu-20.04
+                      python-version: '3.11'
+                      pyomo-version: 6.4.3
         steps:
           - uses: actions/checkout@v2
           - uses: conda-incubator/setup-miniconda@v2