From c66ef91865de86685e2860897e7376b52f775646 Mon Sep 17 00:00:00 2001 From: Roman Kuzmenko Date: Fri, 12 Jan 2024 23:29:31 -0800 Subject: [PATCH] Attempting to fix actions on windows --- .github/workflows/python-build.yml | 16 ++++++++-------- .github/workflows/python-test.yml | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml index 2c7420d..e5785fa 100644 --- 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 index 73c52b9..5ae51f0 100644 --- 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