Merge pull request #402 from sbesson/win_regression

Fix Windows regression in omero_ext.path
ome · Mar 25, 2024 · 815874b · 815874b
2 parents 0dc60bd + 8f16016
commit 815874b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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

diff --git 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