Skip to content

Commit

Permalink
Fix ci/cd
Browse files Browse the repository at this point in the history
  • Loading branch information
almarklein committed Sep 21, 2024
1 parent 7b195d9 commit 6a0c5a2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ jobs:
run: |
rm -rf ./wgpu
rm -rf ./dist/*.whl
# Install 'normally' to install deps, then force the install from dist-folder and nothing else
pip install --find-links dist wgpu
pip install requests
pip install --force-reinstall --no-deps --no-index --find-links dist wgpu
pip uninstall -y wgpu
git reset --hard HEAD
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Install dev dependencies
run: |
python -m pip install --upgrade pip
pip install -U -e .[examples]
pip install -U -e .[tests,examples]
- name: Test examples
env:
EXPECT_LAVAPIPE: true
Expand All @@ -142,7 +142,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U -e .[pyinstaller]
pip install -U -e .[tests] glfw pyinstaller
- name: Test PyInstaller
run: |
pyinstaller --version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/screenshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install dev dependencies
run: |
python -m pip install --upgrade pip
pip install -U -e .[screenshots]
pip install -U -e .[tests,examples]
- name: Regenerate screenshots
run: |
pytest -v --regenerate-screenshots -k test_examples_screenshots examples
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ glfw = ["glfw>=1.9"]
imgui = ["imgui-bundle>=1.2.1"]
# For devs / ci
build = ["build", "hatchling", "requests", "twine"]
codegen = ["pytest", "numpy", "black", "cffi"]
codegen = ["pytest", "numpy", "black"]
lint = ["black", "flake8", "flake8-black", "pep8-naming"]
docs = ["sphinx>7.2", "sphinx_rtd_theme"]
tests = ["numpy", "pytest", "psutil"]
examples = ["wgpu[tests]", "imageio"]
pyinstaller = ["wgpu[tests]", "glfw", "pyinstaller>=4.9"]
tests = ["numpy", "pytest", "psutil", "imageio"]
examples = []
dev = ["wgpu[build,codegen,lint,docs,tests,examples]"]

[project.entry-points."pyinstaller40"]
Expand Down

0 comments on commit 6a0c5a2

Please sign in to comment.