From 135a7128d8e304f52448f8ba2a0a465e741279b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Besson?= <sbesson@glencoesoftware.com>
Date: Thu, 21 Mar 2024 20:43:51 +0000
Subject: [PATCH 1/2] Reintroduce Windows coverage in the GitHub workflows

This partly reverts commit efbb1a48338fe9c729cbd67776dc0886b5028fa5
which disabled the CI builds on Windows 2022 as Ice 3.6.5 requires
additional patches for building and led to some regression in the
Python 3.12 support work.

This commit reintroduced Windows 2019 as a target operating system
with a Python version (3.9) with >1 year of support. It also upgrade
GitHub actions for Node.js 20.
---
 .github/workflows/workflow.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 4d8bd12bb..a6642d446 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -24,6 +24,8 @@ jobs:
         include:
           - python-version: '3.8'
             os: macos-latest
+          - python-version: '3.9'
+            os: windows-2019
     runs-on: ${{ matrix.os }}
     steps:
       - name: Get tox target
@@ -33,7 +35,7 @@ jobs:
           echo "py=$py" >> $GITHUB_OUTPUT
         shell: bash
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -51,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.9'
       - name: Build package

From 8f160161d7ef3ce8832eda388c9e0ef88266202e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Besson?= <sbesson@glencoesoftware.com>
Date: Thu, 21 Mar 2024 21:23:32 +0000
Subject: [PATCH 2/2] omero_ext.path: allow pwd module to be be missing

The try/except block was removed in f0548101b658d2030d01c31f35de28506efcd865
which led to regression on Windows systems where pwd is not installed.
---
 src/omero_ext/path.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/omero_ext/path.py b/src/omero_ext/path.py
index e202d06ac..43d095e6a 100644
--- a/src/omero_ext/path.py
+++ b/src/omero_ext/path.py
@@ -61,7 +61,11 @@
 except ImportError:
     pass
 
-import pwd
+try:
+    import pwd
+except ImportError:
+    pass
+
 from functools import reduce
 
 getcwdu = os.getcwd