Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Hugo van Kemenade <[email protected]>
  • Loading branch information
nulano and hugovk committed Nov 28, 2023
1 parent d88ab8a commit 6fe42bd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.x"

- name: Prepare for build
run: |
Expand Down Expand Up @@ -147,14 +147,13 @@ jobs:
CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd"
CIBW_CACHE_PATH: "C:\\cibw"
CIBW_TEST_SKIP: "*-win_arm64"
CIBW_TEST_COMMAND: >-
docker run --rm
CIBW_TEST_COMMAND: 'docker run --rm
-v {project}:C:\pillow
-v C:\cibw:C:\cibw
-v %CD%\..\venv-test:%CD%\..\venv-test
-e CI -e GITHUB_ACTIONS
mcr.microsoft.com/windows/servercore:ltsc2022
powershell C:\pillow\.github\workflows\wheels-test.ps1 %CD%\..\venv-test
powershell C:\pillow\.github\workflows\wheels-test.ps1 %CD%\..\venv-test'
shell: cmd

- name: Upload wheels
Expand Down
4 changes: 2 additions & 2 deletions Tests/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def djpeg_available():
try:
subprocess.check_call(["djpeg", "-version"])
return True
except subprocess.CalledProcessError:
except subprocess.CalledProcessError: # pragma: no cover
return False


Expand All @@ -272,7 +272,7 @@ def cjpeg_available():
try:
subprocess.check_call(["cjpeg", "-version"])
return True
except subprocess.CalledProcessError:
except subprocess.CalledProcessError: # pragma: no cover
return False


Expand Down
6 changes: 4 additions & 2 deletions Tests/test_imagegrab.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@


class TestImageGrab:
@pytest.mark.skipif(
os.environ.get("USERNAME") == "ContainerAdministrator",
reason="can't grab screen when running in Docker",
)
@pytest.mark.skipif(
sys.platform not in ("win32", "darwin"), reason="requires Windows or macOS"
)
def test_grab(self):
if os.environ.get("USERNAME") == "ContainerAdministrator":
pytest.skip("can't grab screen when running in Docker")
ImageGrab.grab()
ImageGrab.grab(include_layered_windows=True)
ImageGrab.grab(all_screens=True)
Expand Down

0 comments on commit 6fe42bd

Please sign in to comment.