Skip to content

Commit e2986e1

Browse files
committed
Do not upgrade NumPy
1 parent 4ebb4a0 commit e2986e1

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

.github/workflows/test-cygwin.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,13 @@ jobs:
9090
run: |
9191
ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
9292
93-
- name: Get latest NumPy version
94-
id: latest-numpy
95-
shell: bash.exe -eo pipefail -o igncr "{0}"
96-
run: |
97-
python3 -m pip list --outdated | grep numpy | sed -r 's/ +/ /g' | cut -d ' ' -f 3 | sed 's/^/version=/' >> $GITHUB_OUTPUT
98-
9993
- name: pip cache
10094
uses: actions/cache@v4
10195
with:
10296
path: 'C:\cygwin\home\runneradmin\.cache\pip'
103-
key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-${{ hashFiles('.ci/install.sh') }}
97+
key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
10498
restore-keys: |
105-
${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-
99+
${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
106100
107101
- name: Build system information
108102
run: |
@@ -112,11 +106,6 @@ jobs:
112106
run: |
113107
bash.exe .ci/install.sh
114108
115-
- name: Upgrade NumPy
116-
shell: dash.exe -l "{0}"
117-
run: |
118-
python3 -m pip install -U "numpy<1.26"
119-
120109
- name: Build
121110
shell: bash.exe -eo pipefail -o igncr "{0}"
122111
run: |

src/PIL/Image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ def __array_interface__(self):
702702
pass
703703
else:
704704
if parse_version(numpy.__version__) < parse_version("1.23"):
705-
warnings.warn(e)
705+
warnings.warn(str(e))
706706
raise
707707
new["shape"], new["typestr"] = _conv_type_shape(self)
708708
return new

0 commit comments

Comments
 (0)