Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace SVN with Git for installing extra test images #6918

Merged
merged 13 commits into from
Feb 10, 2023
Merged

Replace SVN with Git for installing extra test images #6918

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c896601
Replace SVN with Git for installing extra test images
hugovk Jan 27, 2023
120d56b
Sort dependencies
hugovk Jan 28, 2023
7e35e15
Replace subversion with wget package
hugovk Jan 28, 2023
e922714
Merge branch 'main' into rm-svn
radarhere Jan 31, 2023
772567a
Switched to python-pillow repositories
radarhere Jan 31, 2023
da6d83f
Merge pull request #92 from radarhere/rm-svn
hugovk Jan 31, 2023
cc71b4c
Simpler URL
hugovk Feb 4, 2023
e79460e
Removed wget dependency
radarhere Feb 7, 2023
e7d2750
Updated test images origin
radarhere Feb 7, 2023
ed1d663
Use checkout action for test-images repository
radarhere Feb 7, 2023
ed3cd75
Use 'rmdir' instead of 'rm -r'
hugovk Feb 8, 2023
f679e41
Use 'rmdir' instead of 'rm -r'
hugovk Feb 8, 2023
3934964
Merge pull request #93 from radarhere/rm-svn
hugovk Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/test-mingw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ jobs:
${{ matrix.package }}-python3-numpy \
${{ matrix.package }}-python3-olefile \
${{ matrix.package }}-python3-pip \
${{ matrix.package }}-python3-setuptools \
${{ matrix.package }}-wget
${{ matrix.package }}-python3-setuptools

if [ ${{ matrix.package }} == "mingw-w64-x86_64" ]; then
pacman -S --noconfirm \
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ jobs:
repository: python-pillow/pillow-depends
path: winbuild\depends

- name: Checkout extra test images
uses: actions/checkout@v3
with:
repository: python-pillow/test-images
path: Tests\test-images

# sets env: pythonLocation
- name: Set up Python
uses: actions/setup-python@v4
Expand All @@ -63,9 +69,7 @@ jobs:
echo "C:\Program Files (x86)\gs\gs10.0.0\bin" >> $env:GITHUB_PATH

# Install extra test images
curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip
7z x pillow-test-images.zip -oc:\
xcopy /S /Y c:\test-images-main\* Tests\images\
xcopy /S /Y Tests\test-images\* Tests\images

# make cache key depend on VS version
& "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ docs/_build/
# JetBrains
.idea

# Extra test images installed from pillow-depends/test_images
# Extra test images installed from python-pillow/test-images
Tests/images/README.md
Tests/images/crash_1.tif
Tests/images/crash_2.tif
Expand Down