diff --git a/cross/python311/Makefile b/cross/python311/Makefile index 8955f3b4d45..29b615b9b10 100644 --- a/cross/python311/Makefile +++ b/cross/python311/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python311 -PKG_VERS = 3.11.9 +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) @@ -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==43.0.0 +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 @@ -142,17 +142,17 @@ CROSSENV_WHEELS += cryptography==43.0.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.37 +CROSSENV_WHEELS += Cython==3.0.2 +#CROSSENV_WHEELS += Cython==0.29.37 CROSSENV_WHEELS += flit==3.9.0 -CROSSENV_WHEELS += maturin==1.7.1 +CROSSENV_WHEELS += maturin==1.7.4 CROSSENV_WHEELS += poetry==1.8.3 -CROSSENV_WHEELS += scikit-build==0.18.0 -CROSSENV_WHEELS += setuptools-rust==1.10.1 +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.16.0 -#CROSSENV_WHEELS += scikit-build-core==0.10.5 +#CROSSENV_WHEELS += meson-python==1.5.2 +#CROSSENV_WHEELS += scikit-build-core==0.10.7 # Create the crossenv in preparation for @@ -165,28 +165,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.1.1" "wheel==0.44.0" "pip-tools==7.4.1" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==74.1.1" "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 diff --git a/cross/python311/digests b/cross/python311/digests index 7783f1c29d1..80952233979 100644 --- a/cross/python311/digests +++ b/cross/python311/digests @@ -1,3 +1,3 @@ -Python-3.11.9.tar.xz SHA1 926cd6a577b2e8dcbb17671b30eda04019328ada -Python-3.11.9.tar.xz SHA256 9b1e896523fc510691126c864406d9360a3d1e986acbda59cda57b5abda45b87 -Python-3.11.9.tar.xz MD5 22ea467e7d915477152e99d5da856ddc +Python-3.11.10.tar.xz SHA1 eb0ee5c84407445809a556592008cfc1867a39bc +Python-3.11.10.tar.xz SHA256 07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372 +Python-3.11.10.tar.xz MD5 af59e243df4c7019f941ae51891c10bc diff --git a/native/python311/Makefile b/native/python311/Makefile index cc6a833a49d..224df7c2a7d 100644 --- a/native/python311/Makefile +++ b/native/python311/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python311 -PKG_VERS = 3.11.9 +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) @@ -37,7 +37,7 @@ python311_native_post_install: $(WORK_DIR)/python-native.mk @$(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==74.1.1" "setuptools-rust==1.10.1" "maturin==1.7.1" "wheel==0.44.0" "cffi==1.17.0" "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) >> $@ diff --git a/native/python311/digests b/native/python311/digests index 7783f1c29d1..80952233979 100644 --- a/native/python311/digests +++ b/native/python311/digests @@ -1,3 +1,3 @@ -Python-3.11.9.tar.xz SHA1 926cd6a577b2e8dcbb17671b30eda04019328ada -Python-3.11.9.tar.xz SHA256 9b1e896523fc510691126c864406d9360a3d1e986acbda59cda57b5abda45b87 -Python-3.11.9.tar.xz MD5 22ea467e7d915477152e99d5da856ddc +Python-3.11.10.tar.xz SHA1 eb0ee5c84407445809a556592008cfc1867a39bc +Python-3.11.10.tar.xz SHA256 07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372 +Python-3.11.10.tar.xz MD5 af59e243df4c7019f941ae51891c10bc diff --git a/spk/python311/Makefile b/spk/python311/Makefile index 2dbf59174b5..87eba19e7ee 100644 --- a/spk/python311/Makefile +++ b/spk/python311/Makefile @@ -1,5 +1,5 @@ SPK_NAME = python311 -SPK_VERS = 3.11.9 +SPK_VERS = 3.11.10 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS))) SPK_REV = 9 SPK_ICON = src/python3.png @@ -18,7 +18,7 @@ DESCRIPTION_FRE = Language de programmation Python. DESCRIPTION_SPN = Lenguaje de programaciĆ³n Python. STARTABLE = no DISPLAY_NAME = Python 3.11 -CHANGELOG = "1. Update to Python 3.11.9" +CHANGELOG = "1. Update to Python 3.11.10
2. Update all mandatory wheels" HOMEPAGE = https://www.python.org LICENSE = PSF @@ -28,7 +28,7 @@ WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1 WHEELS = src/requirements-pure.txt # Force testing all wheel builds -WHEELS_TEST_ALL = 1 +WHEELS_TEST_ALL = 0 SERVICE_SETUP = src/service-setup.sh diff --git a/spk/python311/src/requirements-pure.txt b/spk/python311/src/requirements-pure.txt index 627f05eca73..9dd870046fa 100644 --- a/spk/python311/src/requirements-pure.txt +++ b/spk/python311/src/requirements-pure.txt @@ -3,25 +3,25 @@ pip==24.2 # Always match what's in cross/python310/Makefile -setuptools==74.1.1 +setuptools==75.1.0 wheel==0.44.0 # Always use latest version available -# certifi==2023.7.22 +# certifi==2024.8.30 certifi # Mandatory for python application # to create their local virtualenv # in order to install wheels within # their running environment -virtualenv==20.26.3 +virtualenv==20.26.6 # Other mandatory wheels that # gets install by default as # basic dependencies of above distlib==0.3.8 -filelock==3.15.4 -platformdirs==4.2.2 +filelock==3.16.1 +platformdirs==4.3.6 six==1.16.0 ##