Attempting to fix actions on windows

openvmp · Jan 13, 2024 · c66ef91 · c66ef91
1 parent e2e82a9
commit c66ef91
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
@@ -41,17 +41,17 @@ jobs:
           python -m pip install --upgrade pip build
           mkdir .venv
           python -m venv .venv/build
-          (source .venv/build/bin/activate && python -m pip install --upgrade pip build)
+          (. .venv/build/bin/activate && python -m pip install --upgrade pip build; deactivate)
           python -m venv .venv/build-cli
-          (source .venv/build-cli/bin/activate && python -m pip install --upgrade pip build)
+          (. .venv/build-cli/bin/activate && python -m pip install --upgrade pip build; deactivate)
           python -m venv .venv/install
-          (source .venv/install/bin/activate && python -m pip install --upgrade pip build)
+          (. .venv/install/bin/activate && python -m pip install --upgrade pip build; deactivate)
       - name: Test building and packaging
         run: |
-          (source .venv/build/bin/activate && cd partcad && python -m build)
-          (source .venv/build-cli/bin/activate && python -m pip install partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl)
-          (source .venv/build-cli/bin/activate && cd partcad-cli && python -m build)
+          (. .venv/build/bin/activate && cd partcad && python -m build; deactivate)
+          (. .venv/build-cli/bin/activate && python -m pip install partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl; deactivate)
+          (. .venv/build-cli/bin/activate && cd partcad-cli && python -m build; deactivate)
       - name: Test installation
         run: |
-          (source .venv/install/bin/activate && python -m pip install     partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl)
-          (source .venv/install/bin/activate && python -m pip install partcad-cli/dist/partcad_cli-[0-9].[0-9]*.[0-9]*-py3-none-any.whl)
+          (. .venv/install/bin/activate && python -m pip install     partcad/dist/partcad-[0-9].[0-9]*.[0-9]*-py3-none-any.whl; deactivate)
+          (. .venv/install/bin/activate && python -m pip install partcad-cli/dist/partcad_cli-[0-9].[0-9]*.[0-9]*-py3-none-any.whl; deactivate)
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -38,5 +38,7 @@ jobs:
           pip install -r partcad/requirements.txt
           # pip install -r partcad-cli/requirements.txt
       - name: Test with pytest
+        env:
+          PYTHONPATH: partcad/src
         run: |
-          PYTHONPATH=partcad/src pytest
+          pytest