Skip to content

Upgrade versions of urllib3, sqlparse, geopandas, django and pillow #11475

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

Merged
antonioettorre merged 35 commits into from
May 22, 2026
Merged

Upgrade versions of urllib3, sqlparse, geopandas, django and pillow #11475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
dc16371
Upgrade versions of urllib3, sqlparse, geopandas, django and pillow
ptormene May 18, 2026
d9a826d
Fix a missing = in the requirement for pillow
ptormene May 18, 2026
61f98e9
Merge remote-tracking branch 'origin/master' into updatedeps
ptormene May 19, 2026
a917b37
Merge remote-tracking branch 'origin/master' into updatedeps
ptormene May 19, 2026
62e5f70
Update dependencies also for protobuf and fonttols
ptormene May 19, 2026
1239625
Update windows_test.yml
vot4anto May 19, 2026
2433b42
typo
vot4anto May 19, 2026
1065d37
Update webui_rh_test.yml
vot4anto May 19, 2026
fa7e953
Update dependencies also for zipp and idna
ptormene May 19, 2026
a12f32a
Update also pytest version
ptormene May 19, 2026
686363e
Merge remote-tracking branch 'origin/master' into updatedeps
ptormene May 19, 2026
7633ded
Revert updating geopandas version
ptormene May 19, 2026
27a720d
Update also requests version
ptormene May 19, 2026
30a3a4c
add wheel for geopandas
vot4anto May 19, 2026
399eaf3
resolve conflict
vot4anto May 19, 2026
c89417a
update wheel for py on Linux, Win and MacOS
vot4anto May 20, 2026
02f62b8
remove old version certifi
vot4anto May 20, 2026
8ddbd4d
protobuf for linux
vot4anto May 20, 2026
966f263
protobuf for windows
vot4anto May 20, 2026
c5a6923
protobuf for MacOS
vot4anto May 20, 2026
7cdcfbf
fonttools wheels
vot4anto May 20, 2026
728f45d
pillow wheels for linux
vot4anto May 20, 2026
78cb74b
pillow wheels for windows
vot4anto May 20, 2026
109c44e
pillow wheels for MacOS
vot4anto May 20, 2026
0dca46b
typo
vot4anto May 20, 2026
316982c
resolve conflict on requirements files
vot4anto May 20, 2026
30867d7
geopandas on MacOS and win
vot4anto May 20, 2026
2ad31ad
typo on fonttools-4.60.2
vot4anto May 20, 2026
55696a4
typo on fonttools-4.60.2
vot4anto May 20, 2026
21985af
typo on fonttools-4.60.2 on MacOS py313
vot4anto May 20, 2026
fbfb256
typo on fonttools-4.60.2 on 3.11 and 3.12
vot4anto May 20, 2026
45765ec
typo on protobuf
vot4anto May 20, 2026
7253bb3
typo
vot4anto May 20, 2026
61d6901
reorder requirements based on master version of them, introduce an he…
nastasi-oq May 20, 2026
fd6c814
keep track in requirements files of removed packages between master a…
nastasi-oq May 21, 2026
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
61 changes: 61 additions & 0 deletions helpers/requirements_reorder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#!/bin/bash
echo "BEGIN"
IFS='
'
REQ_MASTER=/tmp/requirements_master.$$
for fin in $(ls requirements-*.txt); do
echo "Processing $fin"
NEW_REQ=/tmp/new_req.$$
rm -rf "$NEW_REQ"
git show master:$fin >$REQ_MASTER
for r in $(cat "$REQ_MASTER"); do
# echo "ROW: $r"
if $(echo "$r" | grep -q '^\s*#'); then
echo "$r" >> $NEW_REQ
continue
elif $(echo "$r" | grep -q '^\s$'); then
echo "$r" >> $NEW_REQ
continue
else
package="$(echo "$r" | sed 's@^.*/@@g;s@-.*@@g')"
fi

if grep -q -o "/${package}-" $fin; then
lin="$(grep -n -o "/${package}-" "$fin" | cut -d: -f1)"
n_lin="$(echo "$lin" | wc -l)"
if [ $n_lin -ne 1 ]; then
echo "Multiple entry on file $fin, for package $package"
exit 1
fi
# echo "${fin}: FOUND $package AT LINE $lin"
cat "$fin" | sed -n ${lin}p >> $NEW_REQ
else
echo "${fin}: OLD $package NOT FOUND: add it commented with the name of this branch"
echo "# Package '$package' removed at branch '$(git branch --show-current)'" >> $NEW_REQ
echo "# $r" >> $NEW_REQ
fi
done

for r in $(cat "$fin"); do
# echo "ROW: $r"
if $(echo "$r" | grep -q '^\s*#'); then
echo "$fin: ALERT, THIS COMMENT: [$r] WILL BE SKIPPED, INTRODUCE AGAIN MANUALLY IF REQUIRED"
continue
elif $(echo "$r" | grep -q '^\s$'); then
continue
else
package="$(echo "$r" | sed 's@^.*/@@g;s@-.*@@g')"
fi

if ! grep -q -o "/${package}-" "$REQ_MASTER"; then
echo "${fin}, ALERT, entry: [$r] NOT FOUND, append at the end of the file"
echo "# Package '${package}' added at branch '$(git branch --show-current)'" >> $NEW_REQ
echo "$r" >> $NEW_REQ
fi
done

cp "$NEW_REQ" "$fin"
echo
echo
done
rm $REQ_MASTER
34 changes: 18 additions & 16 deletions requirements-py311-linux64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ https://wheelhouse.openquake.org/v3/linux/py311/numba-0.61.2-cp311-cp311-manylin
https://wheelhouse.openquake.org/v3/linux/py311/numpy-2.2.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/onnxruntime-1.23.2-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/pandas-2.2.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/pillow-12.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/pillow-12.2.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/pyogrio-0.11.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
https://wheelhouse.openquake.org/v3/linux/py311/pyproj-3.7.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
Expand All @@ -26,54 +26,56 @@ https://wheelhouse.openquake.org/v3/linux/py311/setproctitle-1.3.7-cp311-cp311-m
https://wheelhouse.openquake.org/v3/linux/py311/shapely-2.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
#pp
https://wheelhouse.openquake.org/v3/py/alpha_shapes-1.1.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/asgiref-3.7.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/asgiref-3.11.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/attrs-23.1.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/certifi-2023.11.17-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/certifi-2026.4.22-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/chardet-5.2.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/click-8.1.7-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/click_plugins-1.1.1-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/cligj-0.7.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/coloredlogs-15.0.1-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/cycler-0.12.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/decorator-5.1.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django-4.2.27-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django-4.2.30-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_cookie_consent-0.6.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_cors_headers-4.3.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_pam-2.1.2-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/docutils-0.20.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/flake8-6.1.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/flatbuffers-25.12.19-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/fonttools-4.39.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/geopandas-1.1.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/fonttools-4.60.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/geopandas-1.1.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/humanfriendly-10.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/idna-3.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/idna-3.15-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/importlib_metadata-7.0.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/iniconfig-2.0.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/iniconfig-2.3.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/mccabe-0.7.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/mpmath-1.3.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/munch-4.0.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/networkx-3.2.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/packaging-26.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/packaging-26.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pbr-6.0.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/protobuf-4.25.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.6.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/protobuf-5.29.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pycodestyle-2.11.1-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pycparser-2.22-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pyflakes-3.1.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pyparsing-3.1.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pyreadline3-3.4.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-9.0.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/python_dateutil-2.8.2-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/python_pam-2.0.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytz-2023.3-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/requests-2.31.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/requests-2.33.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/setuptools-79.0.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/six-1.16.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/sqlparse-0.4.4-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/sqlparse-0.5.5-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/sympy-1.12-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/timezonefinder-8.2.1-cp39-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl
https://wheelhouse.openquake.org/v3/py/toml-0.10.2-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/tzdata-2023.3-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/urllib3-2.1.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/urllib3-2.7.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/zipp-3.19.1-py3-none-any.whl
# Added at branch updatedeps
https://wheelhouse.openquake.org/v3/py/pygments-2.20.0-py3-none-any.whl
34 changes: 18 additions & 16 deletions requirements-py311-macos_arm64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ https://wheelhouse.openquake.org/v3/macos/arm64/py311/numba-0.61.2-cp311-cp311-m
https://wheelhouse.openquake.org/v3/macos/arm64/py311/numpy-2.2.6-cp311-cp311-macosx_11_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/onnxruntime-1.23.2-cp311-cp311-macosx_13_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/pandas-2.2.3-cp311-cp311-macosx_11_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/pillow-12.1.1-cp311-cp311-macosx_11_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/pillow-12.2.0-cp311-cp311-macosx_11_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/pyogrio-0.11.1-cp311-cp311-macosx_11_0_arm64.whl
https://wheelhouse.openquake.org/v3/macos/arm64/py311/pyproj-3.7.2-cp311-cp311-macosx_11_0_arm64.whl
Expand All @@ -25,53 +25,55 @@ https://wheelhouse.openquake.org/v3/macos/arm64/py311/setproctitle-1.3.7-cp311-c
https://wheelhouse.openquake.org/v3/macos/arm64/py311/shapely-2.1.0-cp311-cp311-macosx_11_0_arm64.whl
#pp
https://wheelhouse.openquake.org/v3/py/alpha_shapes-1.1.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/asgiref-3.7.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/asgiref-3.11.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/attrs-23.1.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/certifi-2023.11.17-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/certifi-2026.4.22-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/chardet-5.2.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/click-8.1.7-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/click_plugins-1.1.1-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/cligj-0.7.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/coloredlogs-15.0.1-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/cycler-0.12.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/decorator-5.1.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django-4.2.27-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django-4.2.30-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_appconf-1.0.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_cookie_consent-0.6.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_cors_headers-4.3.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/django_pam-2.1.2-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/docutils-0.20.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/flake8-6.1.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/flatbuffers-25.12.19-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/fonttools-4.39.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/geopandas-1.1.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/fonttools-4.60.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/geopandas-1.1.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/humanfriendly-10.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/idna-3.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/idna-3.15-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/importlib_metadata-7.0.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/iniconfig-2.0.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/iniconfig-2.3.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/mccabe-0.7.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/mpmath-1.3.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/munch-4.0.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/networkx-3.2.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/packaging-26.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/packaging-26.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pbr-6.0.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.5.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/protobuf-4.25.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pluggy-1.6.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/protobuf-5.29.6-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pycodestyle-2.11.1-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pycparser-2.22-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pyflakes-3.1.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pyparsing-3.1.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pyreadline3-3.4.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-8.3.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytest-9.0.3-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/python_dateutil-2.8.2-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/python_pam-2.0.2-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/pytz-2023.3-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/requests-2.31.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/requests-2.33.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/setuptools-79.0.1-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/six-1.16.0-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/sqlparse-0.4.4-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/sqlparse-0.5.5-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/sympy-1.12-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/toml-0.10.2-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/tzdata-2023.3-py2.py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/urllib3-2.1.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/zipp-3.17.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/urllib3-2.7.0-py3-none-any.whl
https://wheelhouse.openquake.org/v3/py/zipp-3.19.1-py3-none-any.whl
# Added at branch updatedeps
https://wheelhouse.openquake.org/v3/py/pygments-2.20.0-py3-none-any.whl
Loading