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

Jump to bottom

python 3.10-3.11 updates #6200

Merged
merged 17 commits into from
Oct 13, 2024
Merged

python 3.10-3.11 updates #6200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
928fcee
py310-311: Update crossenv cffi==1.17.0 and cryptography==43.0.0
th0ma7 Aug 28, 2024
95e3328
pip: Update from 23.2.1 to 23.3.2
th0ma7 Aug 28, 2024
5304363
py311: Update to 3.11.9 along with updating all wheels
th0ma7 Aug 28, 2024
282b76f
py310: Update all wheels
th0ma7 Aug 28, 2024
cc446c8
py311: Downgrade numpy back to 1.25.2
th0ma7 Aug 28, 2024
389a33d
py310-py311: Fully functional build locally
th0ma7 Aug 28, 2024
3c92ba8
py310-py311: Re-enable numpy
th0ma7 Aug 28, 2024
78e9e15
pip: Update from version 23.3.2 to 24.2
th0ma7 Sep 3, 2024
ce4ebee
py310-311: Misc post-rebase adjustments
th0ma7 Sep 3, 2024
7509fe4
pip: Revert back to version 23.2.1
th0ma7 Sep 3, 2024
dde136f
pip (pure/wheel): force installing latest version 24.2
th0ma7 Sep 3, 2024
6a2d573
python310: Update to version 3.10.15
th0ma7 Oct 9, 2024
65c1b2b
python311: Update to version 3.11.10
th0ma7 Oct 9, 2024
0c09e47
remove comments and empty lines in final requirements-abi3.txt and re…
hgy59 Oct 11, 2024
1efe8fe
python311: fix to make all wheels
hgy59 Oct 11, 2024
0337438
python311: temp build with all wheels
hgy59 Oct 11, 2024
c584dba
Revert "python311: temp build with all wheels"
hgy59 Oct 12, 2024
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: 2 additions & 1 deletion cross/pip/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PKG_NAME = pip
# use the same version in native/python310|311/Makefile (python310|311_native_post_install)
# used to be the same version in native/python310|311/Makefile (python310|311_native_post_install)
# but this is now the last version of pip that can be installed using legacy setup.py
PKG_VERS = 23.2.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
Expand Down
44 changes: 13 additions & 31 deletions cross/python310/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = python310
PKG_VERS = 3.10.14
PKG_VERS = 3.10.15
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
PKG_EXT = tar.xz
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
Expand Down Expand Up @@ -144,19 +144,19 @@ CROSSENV_WHEELS = cffi==1.17.0
# It also breaks numpy at crossenv creation time using github-action
# https://numpy.org/devdocs/reference/distutils_status_migration.html
# Python 3.12 considerations: scikit-build-core, meson-python
#CROSSENV_WHEELS += Cython==3.0.2
CROSSENV_WHEELS += Cython==0.29.36
CROSSENV_WHEELS += Cython==3.0.2
#CROSSENV_WHEELS += Cython==0.29.37
CROSSENV_WHEELS += flit==3.9.0
CROSSENV_WHEELS += scikit-build==0.17.6
CROSSENV_WHEELS += setuptools-rust==1.7.0
CROSSENV_WHEELS += setuptools-scm==7.1.0
CROSSENV_WHEELS += scikit-build==0.18.1
CROSSENV_WHEELS += setuptools-rust==1.10.2
CROSSENV_WHEELS += setuptools-scm==8.1.0
# For future use when building numpy >= 1.26
#CROSSENV_WHEELS += meson-python==0.13.2
#CROSSENV_WHEELS += scikit-build-core==0.5.0
#CROSSENV_WHEELS += meson-python==1.5.2
#CROSSENV_WHEELS += scikit-build-core==0.10.7
ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
CROSSENV_WHEELS += cryptography==41.0.3
CROSSENV_WHEELS += maturin==1.2.3
CROSSENV_WHEELS += poetry==1.6.1
CROSSENV_WHEELS += cryptography==43.0.1
CROSSENV_WHEELS += maturin==1.7.4
CROSSENV_WHEELS += poetry==1.8.3
endif

# Create the crossenv in preparation for
Expand All @@ -169,28 +169,10 @@ python310_post_install: $(WORK_DIR)/python-cc.mk
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget --no-verbose https://bootstrap.pypa.io/get-pip.py
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==24.2" --no-setuptools --no-wheel --disable-pip-version-check
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==24.2" --no-setuptools --no-wheel --disable-pip-version-check
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==74.0.0" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==74.0.0" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==75.1.0" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==75.1.0" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install $(CROSSENV_WHEELS)
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install $(CROSSENV_WHEELS)
# [numpy] <= 1.2x.y Must be installed using setuptools < 70.0
# [numpy] <= 1.21.6 (armv5) - gcc-4.6.4 - unsupported
# [numpy] <= 1.22.4 (armv7l) - gcc-4.8.3 - unsupported
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==69.5.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==69.5.1"
# [numpy] <= 1.24.4 last working version with gcc-4.9
ifeq ($(call version_le, $(TC_GCC), 5.0),1)
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "numpy==1.24.4"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "numpy==1.24.4"
# [numpy] >= 1.25.0 requires c++17
else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "numpy==1.25.2"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "numpy==1.25.2"
endif
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==74.0.0"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==74.0.0"
endif
ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
endif
Expand Down
6 changes: 3 additions & 3 deletions cross/python310/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Python-3.10.14.tar.xz SHA1 9103b4716dff30b40fd0239982f3a2d851143a46
Python-3.10.14.tar.xz SHA256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda
Python-3.10.14.tar.xz MD5 05148354ce821ba7369e5b7958435400
Python-3.10.15.tar.xz SHA1 f498fd8921e3c37e6aded9acb11ed23c8daa0bbe
Python-3.10.15.tar.xz SHA256 aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
Python-3.10.15.tar.xz MD5 8b1faa1b193e4e90c0f17eb2decd89b5
46 changes: 15 additions & 31 deletions cross/python311/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = python311
PKG_VERS = 3.11.5
PKG_VERS = 3.11.10
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
PKG_EXT = tar.xz
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
Expand Down Expand Up @@ -133,8 +133,8 @@ python311_install:
$(RUN) _PYTHON_HOST_PLATFORM=$(TC_TARGET) $(MAKE) install prefix=$(STAGING_INSTALL_PREFIX)

# default wheels to install in crossenv
CROSSENV_WHEELS = cffi==1.17.0
CROSSENV_WHEELS += cryptography==41.0.3
CROSSENV_WHEELS = cffi==1.17.1
CROSSENV_WHEELS += cryptography==43.0.1
#
# Cython version >= 3.x breaks PyYAML wheel
# https://github.com/yaml/pyyaml/issues/601
Expand All @@ -143,16 +143,18 @@ CROSSENV_WHEELS += cryptography==41.0.3
# https://numpy.org/devdocs/reference/distutils_status_migration.html
# Python 3.12 considerations: scikit-build-core, meson-python
#CROSSENV_WHEELS += Cython==3.0.2
CROSSENV_WHEELS += Cython==0.29.36
CROSSENV_WHEELS += Cython==0.29.37
CROSSENV_WHEELS += flit==3.9.0
CROSSENV_WHEELS += maturin==1.2.3
CROSSENV_WHEELS += poetry==1.6.1
CROSSENV_WHEELS += scikit-build==0.17.6
CROSSENV_WHEELS += setuptools-rust==1.7.0
CROSSENV_WHEELS += setuptools-scm==7.1.0
CROSSENV_WHEELS += maturin==1.7.4
CROSSENV_WHEELS += poetry==1.8.3
CROSSENV_WHEELS += scikit-build==0.18.1
CROSSENV_WHEELS += setuptools-rust==1.10.2
CROSSENV_WHEELS += setuptools-scm==8.1.0
# For future use when building numpy >= 1.26
#CROSSENV_WHEELS += meson-python==0.13.2
#CROSSENV_WHEELS += scikit-build-core==0.5.0
#CROSSENV_WHEELS += meson-python==1.5.2
#CROSSENV_WHEELS += scikit-build-core==0.10.7
# For pydantic_core==2.23.0: (typing-extensions >=4.6.0,!=4.7.0)
CROSSENV_WHEELS += typing_extensions==4.12.2


# Create the crossenv in preparation for
Expand All @@ -165,28 +167,10 @@ python311_post_install: $(WORK_DIR)/python-cc.mk
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget --no-verbose https://bootstrap.pypa.io/get-pip.py
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==24.2" --no-setuptools --no-wheel --disable-pip-version-check
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==24.2" --no-setuptools --no-wheel --disable-pip-version-check
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==74.0.0" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==74.0.0" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.44.0" "pip-tools==7.4.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install $(CROSSENV_WHEELS)
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install $(CROSSENV_WHEELS)
# [numpy] <= 1.2x.y Must be installed using setuptools < 70.0
# [numpy] <= 1.21.6 (armv5) - gcc-4.6.4 - unsupported
# [numpy] <= 1.22.4 (armv7l) - gcc-4.8.3 - unsupported
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==69.5.1"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==69.5.1"
# [numpy] <= 1.24.4 last working version with gcc-4.9
ifeq ($(call version_le, $(TC_GCC), 5.0),1)
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "numpy==1.24.4"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "numpy==1.24.4"
# [numpy] >= 1.25.0 requires c++17
else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "numpy==1.25.2"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "numpy==1.25.2"
endif
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==74.0.0"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==74.0.0"
endif
ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
endif
Expand Down
6 changes: 3 additions & 3 deletions cross/python311/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Python-3.11.5.tar.xz SHA1 b13ec58fa6ebf5b0f7178555c5506e135cb7d785
Python-3.11.5.tar.xz SHA256 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
Python-3.11.5.tar.xz MD5 393856f1b7713aa8bba4b642ab9985d3
Python-3.11.10.tar.xz SHA1 eb0ee5c84407445809a556592008cfc1867a39bc
Python-3.11.10.tar.xz SHA256 07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372
Python-3.11.10.tar.xz MD5 af59e243df4c7019f941ae51891c10bc
2 changes: 1 addition & 1 deletion mk/spksrc.wheel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ ifneq ($(strip $(WHEELS)),)
sed -e '/^pure:\|^#\|^$$/d' -e /^cross:/s/^cross://g $$wheel >> $(WHEELHOUSE)/$(WHEELS_CROSSENV_COMPILE) ; \
elif [ $$(basename $$wheel) = $(WHEELS_LIMITED_API) ]; then \
$(MSG) "Adding existing $$wheel file as ABI-limited" ; \
cat $$wheel >> $(WHEELHOUSE)/$(WHEELS_LIMITED_API) ; \
sed -e '/^#\|^$$/d' $$wheel >> $(WHEELHOUSE)/$(WHEELS_LIMITED_API) ; \
else \
$(MSG) "Adapting existing $$wheel file" ; \
sed -rn /^pure:/s/^pure://gp $$wheel >> $(WHEELHOUSE)/$(WHEELS_PURE_PYTHON) ; \
Expand Down
8 changes: 4 additions & 4 deletions native/python310/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = python310
PKG_VERS = 3.10.14
PKG_VERS = 3.10.15
PKG_EXT = tar.xz
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
Expand Down Expand Up @@ -34,10 +34,10 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
.PHONY: python310_native_post_install
python310_native_post_install: $(WORK_DIR)/python-native.mk
@$(MSG) Installing pip
@$(RUN) wget --no-verbose https://bootstrap.pypa.io/get-pip.py
@$(RUN) $(PYTHON) get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
@$(RUN) $(PYTHON) get-pip.py "pip==24.2" --no-setuptools --no-wheel --disable-pip-version-check
@$(MSG) Installing setuptools, wheel, cffi and cross env
@$(PIP) --disable-pip-version-check install "setuptools==68.1.2" "setuptools-rust==1.7.0" "maturin==1.2.3" "wheel==0.41.2" "cffi==1.15.1" "crossenv==1.4.0"
@$(PIP) --disable-pip-version-check install "setuptools==75.1.0" "setuptools-rust==1.10.2" "maturin==1.7.4" "wheel==0.44.0" "cffi==1.17.1" "crossenv==1.5.0"

$(WORK_DIR)/python-native.mk:
@echo PIP=$(PIP_NATIVE) >> $@
6 changes: 3 additions & 3 deletions native/python310/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Python-3.10.14.tar.xz SHA1 9103b4716dff30b40fd0239982f3a2d851143a46
Python-3.10.14.tar.xz SHA256 9c50481faa8c2832329ba0fc8868d0a606a680fc4f60ec48d26ce8e076751fda
Python-3.10.14.tar.xz MD5 05148354ce821ba7369e5b7958435400
Python-3.10.15.tar.xz SHA1 f498fd8921e3c37e6aded9acb11ed23c8daa0bbe
Python-3.10.15.tar.xz SHA256 aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
Python-3.10.15.tar.xz MD5 8b1faa1b193e4e90c0f17eb2decd89b5
6 changes: 3 additions & 3 deletions native/python311/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = python311
PKG_VERS = 3.11.5
PKG_VERS = 3.11.10
PKG_EXT = tar.xz
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
Expand Down Expand Up @@ -35,9 +35,9 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
python311_native_post_install: $(WORK_DIR)/python-native.mk
@$(MSG) Installing pip
@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
@$(RUN) $(PYTHON) get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
@$(RUN) $(PYTHON) get-pip.py "pip==24.2" --no-setuptools --no-wheel --disable-pip-version-check
@$(MSG) Installing setuptools, wheel, cffi and cross env
@$(PIP) --disable-pip-version-check install "setuptools==68.1.2" "setuptools-rust==1.7.0" "maturin==1.2.3" "wheel==0.41.2" "cffi==1.15.1" "crossenv==1.4.0"
@$(PIP) --disable-pip-version-check install "setuptools==75.1.0" "setuptools-rust==1.10.2" "maturin==1.7.4" "wheel==0.44.0" "cffi==1.17.1" "crossenv==1.5.0"

$(WORK_DIR)/python-native.mk:
@echo PIP=$(PIP_NATIVE) >> $@
6 changes: 3 additions & 3 deletions native/python311/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Python-3.11.5.tar.xz SHA1 b13ec58fa6ebf5b0f7178555c5506e135cb7d785
Python-3.11.5.tar.xz SHA256 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
Python-3.11.5.tar.xz MD5 393856f1b7713aa8bba4b642ab9985d3
Python-3.11.10.tar.xz SHA1 eb0ee5c84407445809a556592008cfc1867a39bc
Python-3.11.10.tar.xz SHA256 07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372
Python-3.11.10.tar.xz MD5 af59e243df4c7019f941ae51891c10bc
4 changes: 3 additions & 1 deletion spk/bazarr/src/requirements-crossenv-numpy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
# [numpy]
# - Require Cython in cross/python311 crossenv
# - Numpy 1.25.x require c++17
numpy==1.25.1
#numpy==1.25.1
# - Temp. reverted to 1.24.x
numpy==1.24.4
10 changes: 6 additions & 4 deletions spk/python310/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPK_NAME = python310
SPK_VERS = 3.10.14
SPK_VERS = 3.10.15
SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
SPK_REV = 20
SPK_REV = 21
SPK_ICON = src/python3.png

DEPENDS = cross/$(SPK_NAME)
Expand All @@ -13,7 +13,7 @@ DESCRIPTION_FRE = Language de programmation Python.
DESCRIPTION_SPN = Lenguaje de programación Python.
STARTABLE = no
DISPLAY_NAME = Python 3.10
CHANGELOG = "1. Update to Python 3.10.14"
CHANGELOG = "1. Update to Python 3.10.15<br/>2. Update all mandatory wheels"

HOMEPAGE = https://www.python.org
LICENSE = PSF
Expand Down Expand Up @@ -64,7 +64,8 @@ DEPENDS += cross/libxml2
DEPENDS += cross/libxslt

# [mysqlclient]
DEPENDS += cross/mysql-connector-c cross/mariadb-connector-c
DEPENDS += cross/mysql-connector-c
DEPENDS += cross/mariadb-connector-c
ENV += MYSQLCLIENT_CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/mysql -I$(STAGING_INSTALL_PREFIX)/include/mariadb -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)"
ENV += MYSQLCLIENT_LDFLAGS="$(LDFLAGS)"

Expand Down Expand Up @@ -130,6 +131,7 @@ else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
WHEELS += src/requirements-crossenv-numpy.txt
endif
endif

# workaround for compiler bug:
# https://github.com/numpy/numpy/issues/13622
ifeq ($(call version_le, $(TC_GCC), 5.0),1)
Expand Down
4 changes: 2 additions & 2 deletions spk/python310/src/requirements-abi3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# Require:
# - CFLAGS=-sdt=c99 < gcc-4.9
# - CFLAGS=-sdt=c11 >= gcc-4.9
pycryptodome==3.18.0
pycryptodomex==3.18.0
pycryptodome==3.20.0
pycryptodomex==3.20.0
2 changes: 1 addition & 1 deletion spk/python310/src/requirements-crossenv-greenlet-v2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

# [greenlet]
# - Mandatory require full c++11 support
greenlet==2.0.2
greenlet==3.0.3
2 changes: 2 additions & 0 deletions spk/python310/src/requirements-crossenv-numpy-armv7l.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
# [numpy]
# - armv7L (hi3535-6.1) Last known working version
# - Require Cython in cross/python310 crossenv
# - numpy.distutils is deprecated since NumPy 1.23.0
# Recommend to use `setuptools < 60.0` for Python >= 3.12
numpy==1.22.4
2 changes: 2 additions & 0 deletions spk/python310/src/requirements-crossenv-numpy-gcc4.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
# - Require Cython in cross/python311 crossenv
# - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
# ref: https://github.com/numpy/numpy/issues/13622
# - numpy.distutils is deprecated since NumPy 1.23.0
# Recommend to use `setuptools < 60.0` for Python >= 3.12
numpy==1.24.4
Loading