Commit Graph

13204 Commits

Author SHA1 Message Date
DWesl
c5356010ff
Merge pull request #8 from radarhere/add-cygwin-to-ci
Removed steps that are currently unnecessary.  Hopefully they stay that way.
2022-05-07 07:46:41 -04:00
DWesl
7c97d84576
CI: Stop testing numpy imports
Install seems to be working now.

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2022-05-07 07:42:40 -04:00
Andrew Murray
a5b20f7a34 Removed setting alternative 2022-05-07 15:29:49 +10:00
Andrew Murray
eee481176d Removed DLL rebase 2022-05-07 14:52:28 +10:00
DWesl
b670df828d
STY: Fix English in .github/workflows/test-cygwin.yml
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2022-05-06 22:43:03 -04:00
Andrew Murray
3005ea1ef3 Merge branch 'main' into add-cygwin-to-ci 2022-05-06 10:51:24 +10:00
Hugo van Kemenade
3fa89f09eb
Merge pull request #6274 from radarhere/imagetk
Skip test_imagetk if tk raises a RuntimeError
2022-05-05 23:41:55 +03:00
DWesl
2067f60409 STY: Commit suggestions from PR review. 2022-05-05 15:21:22 -04:00
Andrew Murray
45f862e7dc Update CHANGES.rst [ci skip] 2022-05-05 21:32:27 +10:00
Hugo van Kemenade
779fb4975b
Merge pull request #6270 from radarhere/samples_per_pixel
Adjust BITSPERSAMPLE to match SAMPLESPERPIXEL
2022-05-05 14:22:19 +03:00
Andrew Murray
4e52d06e6c Added test 2022-05-05 17:57:08 +10:00
Andrew Murray
3ad3d2e0ef Update CHANGES.rst [ci skip] 2022-05-05 09:57:39 +10:00
Andrew Murray
26e68ed321 Skip test_imagetk if tk raises a RuntimeError 2022-05-05 08:16:06 +10:00
DWesl
941ff61f17
CI: Drop 32-bit Cygwin from regular testing
Cygwin recommends using 64-bit if at all possible, and will discontinue support entirely within the next year or so.  

This also reduces CI load, which I suppose is polite to those who provide it at no cost.
2022-05-04 09:23:24 -04:00
Hugo van Kemenade
e42d8b0890
Merge pull request #6261 from radarhere/stderr
Hide stderr from --keep-system-libs
2022-05-04 16:22:52 +03:00
Hugo van Kemenade
3aef70ce39
Merge pull request #6269 from radarhere/jpeg2k 2022-05-04 15:52:32 +03:00
Andrew Murray
4dc1a55f65 Adjust BITSPERSAMPLE to match SAMPLESPERPIXEL 2022-05-04 22:11:10 +10:00
Andrew Murray
886fcbe3d6 Do not open images with zero or negative height 2022-05-04 21:25:40 +10:00
DWesl
0b134250fa
CI: Use alternatives to select python version (#4)
* CI: Use alternatives to select python version

* CI: Specify full path to alternatives

/usr/sbin isn't in PATH

* DBG: Print uname to try to avoid bad pip install.

pip>=22 on 32-bit Cygwin seems to cause problems installing coverage.  I have no idea why this is, so I just skip upgrading pip there.

* FIX: Fix syntax of conditional for 32-bit Cygwin

I have no idea if it needs to be able to accept i386, but it will if it comes up.

* FIX: Revert earlier debug change.
2022-05-02 20:38:12 -04:00
Andrew Murray
0c1720d358 Hide stderr from --keep-system-libs 2022-05-03 09:19:09 +10:00
DWesl
ce7489884f
CI: Update Cygwin pip, but not on 32-bit
* CI: Update Cygwin pip, but not on 32-bit

32-bit Cygwin pip>=22 fails to install coverage.

* CI: Let .ci/install.sh handle updating pip

* CI Combine pip update conditions

* CI: Don't try to upgrade pip on 32-bit Cygwin
2022-05-02 17:54:49 -04:00
Andrew Murray
9d988dab6a Update CHANGES.rst [ci skip] 2022-05-02 21:11:01 +10:00
Andrew Murray
0a30e431d2
Merge pull request #6138 from jameshilliard/fix-pkg-config
Search pkgconf system libs/cflags
2022-05-02 21:09:45 +10:00
Andrew Murray
dac49dc5ef
Merge pull request #6198 from MaxFork/improve-changeslog
Convert pre-fork CHANGES to RST
2022-05-02 19:24:01 +10:00
Andrew Murray
44bb3e62df Update CHANGES.rst [ci skip] 2022-05-02 08:23:19 +10:00
Hugo van Kemenade
87c2373265
Merge pull request #6242 from radarhere/ppm_maxval 2022-05-01 21:21:52 +03:00
mergify[bot]
31800a0213
Merge pull request #6255 from radarhere/freetype
Updated freetype to 2.12.1
2022-05-01 12:37:26 +00:00
Andrew Murray
47756b9bcd Updated freetype to 2.12.1 2022-05-01 21:57:59 +10:00
DWesl
143e57b6cd
CI: Specify python minor version everywhere on Cygwin
Finish the last few of these.  It's usually unnecessary, but I ran into trouble once with NumPy, and will likely run into more problems if I start submitting packages.

A different option would be to use alternatives to point python3 at the right python.
2022-04-29 20:40:57 -04:00
Andrew Murray
81b473f9d2 Raise ValueError for invalid maxval 2022-04-30 10:37:50 +10:00
DWesl
3453b0ea5d
Merge pull request #3 from radarhere/add-cygwin-to-ci
Do not install NumPy on Python 3.11

So that's how I was supposed to resolve that merge conflict.  Thank you.
2022-04-29 20:36:35 -04:00
Andrew Murray
2d25e668e7 Do not install NumPy on Python 3.11 2022-04-30 10:19:48 +10:00
DWesl
08e0d0b817
CI: Use bash for rebase step
Hopefully this makes sure rebase finds all of pillow's C extension modules so rebase failures are less likely.
2022-04-29 13:15:04 -04:00
DWesl
88c406eac9
CI: Stop using login shell for build step 2022-04-29 12:57:52 -04:00
DWesl
e0f4c21d01
CI: Remind bash to ignore CR in workflow 2022-04-29 12:36:05 -04:00
DWesl
41976ae125
FIX: Fix syntax for shell call 2022-04-29 11:34:13 -04:00
DWesl
ed0c37d528
CI: Don't use shell for build information 2022-04-29 11:27:01 -04:00
DWesl
91e6457360
CI: Stop using login shell for build info
I should probably avoid login shells in any step that uses a relative path.
2022-04-29 10:53:19 -04:00
DWesl
afa3cea96a
Merge branch 'main' into add-cygwin-to-ci 2022-04-29 10:43:30 -04:00
DWesl
fdbab82f9e
CI: Use dash to check system-info.py
This may be a problem with using a login shell (starts in ~) rather than with using bash over dash.  We'll see in a bit.
2022-04-29 09:54:23 -04:00
Hugo van Kemenade
7d5162cb37
Merge pull request #6250 from radarhere/jpeg2000 2022-04-29 13:54:00 +03:00
Andrew Murray
9c9aa9964e Skip tests unless JPEG 2000 is available 2022-04-29 19:17:03 +10:00
Andrew Murray
489d6f32f1
Merge pull request #6249 from hugovk/3.11-dev
Test Python 3.11-dev
2022-04-29 18:22:30 +10:00
Hugo van Kemenade
f4d2082a27
Fix for RST rendering
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2022-04-29 10:33:49 +03:00
Hugo van Kemenade
b4dab3aca3 Test Python 3.11-dev 2022-04-28 23:15:38 +03:00
Max Base
3afd0959c0
Merge pull request #2 from radarhere/improve-changeslog
Updated RST formatting
2022-04-28 15:27:56 +05:30
Andrew Murray
2613429e24
Merge pull request #6247 from radarhere/link
Updated URL
2022-04-28 09:46:36 +10:00
Hugo van Kemenade
d42efd7ec0
Update URL (#16) 2022-04-28 08:26:57 +10:00
Max Base
87e4ffcc59
Update CHANGES.rst
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
2022-04-27 18:19:04 +04:30
Andrew Murray
a50c3957df Updated URL 2022-04-27 22:28:10 +10:00