Skip to content

Commit 89a8f39

Browse files
th0ma7th0ma7
authored
Python 3.10.12 and 3.11.4 update (#5800)
* python310: Update from version 3.10.11 to 3.10.12 * python311: Update from version 3.11.3 to 3.11.4 * cryptography: Update from version 40.0.2 to 41.0.1 * py310-311: Downgrade Pillow from 10.0.0 to 9.5.0 * py310-311: Numpy 1.25.x require c++17 * py311: Revert static_assert undefined fix GH-94766 This fix python/cpython#103282 actually breaks things using GCC 4.6.4 when enforcing c99. * py310-311: Rename requirement file to match greenlet versions * py310-311: (re)Disable testing all wheels * mariadb-connector-c: Update from version 3.3.4 to 3.3.5 * openssl3: Fix building on aarch64 on DSM 6.x * mariadb-connector-c: Fix build on armv5 (required -std=gnu99) * mariadb-connector-c: Fix is actually required for GCC < 5.0 * py310-311: Major bump to openssl3 * python311: (re)Disable testing all wheels * openssl3: Revert disabling of ASM for aarch64 in favor of #5809
1 parent 129e209 commit 89a8f39

34 files changed

+174
-95
lines changed

‎cross/cryptography/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PKG_NAME = cryptography
2-
PKG_VERS = 40.0.2
2+
PKG_VERS = 41.0.1
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/c/$(PKG_NAME)
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

8-
DEPENDS = cross/openssl cross/cffi
8+
DEPENDS = cross/openssl3 cross/cffi
99

1010
HOMEPAGE = https://github.com/pyca/cryptography
1111
COMMENT = Provide cryptographic recipes and primitives to Python developers

‎cross/cryptography/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cryptography-40.0.2.tar.gz SHA1 9117ce1d7aa19f494fdd590245638c167185fb48
2-
cryptography-40.0.2.tar.gz SHA256 c33c0d32b8594fa647d2e01dbccc303478e16fdd7cf98652d5b3ed11aa5e5c99
3-
cryptography-40.0.2.tar.gz MD5 a5038e911cc5e2f20d1aa424e9c09464
1+
cryptography-41.0.1.tar.gz SHA1 25aba9235d2b4228417783ef1e56ab0293dd2711
2+
cryptography-41.0.1.tar.gz SHA256 d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006
3+
cryptography-41.0.1.tar.gz MD5 49d86f49c47e7b693700887efc117adc

‎cross/curl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://curl.se/download
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

8-
DEPENDS = cross/zlib cross/openssl cross/c-ares
8+
DEPENDS = cross/zlib cross/openssl3 cross/c-ares
99
# optional features (see BUILD_CURL_WITH below)
1010
OPTIONAL_DEPENDS = cross/libssh2
1111
OPTIONAL_DEPENDS += cross/gnutls

‎cross/librtmp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PKG_DIST_NAME = $(REAL_NAME)-$(PKG_VERS).$(PKG_EXT)
66
PKG_DIST_SITE = https://github.com/Distrotech/rtmpdump/archive
77
PKG_DIR = rtmpdump-$(REAL_NAME)-$(PKG_VERS)/librtmp
88

9-
DEPENDS = cross/zlib cross/openssl
9+
DEPENDS = cross/zlib cross/openssl3
1010

1111
HOMEPAGE = https://rtmpdump.mplayerhq.hu/
1212
COMMENT = rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.

‎cross/libssh2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.libssh2.org/download
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

8-
DEPENDS = cross/openssl
8+
DEPENDS = cross/openssl3
99

1010
HOMEPAGE = https://www.libssh2.org
1111
COMMENT = libssh2 is a client-side C library implementing the SSH2 protocol.

‎cross/mariadb-connector-c/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = mariadb-connector-c
2-
PKG_VERS = 3.3.4
2+
PKG_VERS = 3.3.5
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
@@ -16,12 +16,16 @@ CMAKE_DISABLE_EXE_LINKER_FLAGS = 1
1616

1717
include ../../mk/spksrc.cross-cmake.mk
1818

19+
ifeq ($(call version_lt, $(TC_GCC), 5.0),1)
20+
ADDITIONAL_CFLAGS += -std=gnu99
21+
endif
22+
1923
# MySQL specific:
2024
CMAKE_ARGS += -DWITH_UNIT_TESTS=OFF
2125
CMAKE_ARGS += -DDEFAULT_CHARSET=utf8
2226
CMAKE_ARGS += -DINSTALL_LIBDIR=lib
2327

24-
DEPENDS += cross/openssl
28+
DEPENDS += cross/openssl3
2529
CMAKE_ARGS += -DWITH_SSL=ON
2630
DEPENDS += cross/zlib
2731
CMAKE_ARGS += -DWITH_EXTERNAL_ZLIB=ON

‎cross/mariadb-connector-c/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
mariadb-connector-c-3.3.4.tar.gz SHA1 bcf0e027961a730f000f87b37ed179e789817fe6
2-
mariadb-connector-c-3.3.4.tar.gz SHA256 ea6a23850d6a2f6f2e0d9e9fdb7d94fe905a4317f73842272cf121ed25903e1f
3-
mariadb-connector-c-3.3.4.tar.gz MD5 b0d78777e8558ae3718525322fd2bf2f
1+
mariadb-connector-c-3.3.5.tar.gz SHA1 29ad65e81a87e41a93e8984f2c3d1662dcec7c1c
2+
mariadb-connector-c-3.3.5.tar.gz SHA256 c0fda1fa6e52dc85de27156cd847088a72d40d9de6514f7efa57c8d93134a54c
3+
mariadb-connector-c-3.3.5.tar.gz MD5 b8967cf63d4fc5660f230762c0e39ee2

‎cross/nghttp2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERS)
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

8-
DEPENDS = cross/openssl
8+
DEPENDS = cross/openssl3
99

1010
HOMEPAGE = https://nghttp2.org/
1111
COMMENT = HTTP/2 C Library and tools.

‎cross/openldap/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77

8-
DEPENDS = cross/openssl
8+
DEPENDS = cross/openssl3
99

1010
HOMEPAGE = https://www.openldap.org
1111
COMMENT = OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.

‎cross/python310/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python310
2-
PKG_VERS = 3.10.11
2+
PKG_VERS = 3.10.12
33
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
44
PKG_EXT = tar.xz
55
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -53,7 +53,7 @@ CONFIGURE_ARGS += ac_cv_file__dev_ptmx=no
5353
CONFIGURE_ARGS += ac_cv_file__dev_ptc=no
5454
CONFIGURE_ARGS += ac_cv_have_long_long_format=yes
5555

56-
DEPENDS += cross/openssl
56+
DEPENDS += cross/openssl3
5757
CONFIGURE_ARGS += --with-ssl-default-suites=openssl
5858

5959
DEPENDS += cross/gdbm
@@ -135,13 +135,13 @@ python310_install:
135135
# wheels to install in crossenv
136136
CROSSENV_WHEELS = setuptools-rust==1.6.0
137137
CROSSENV_WHEELS += setuptools-scm==7.1.0
138-
CROSSENV_WHEELS += wheel==0.40.0
139-
CROSSENV_WHEELS += poetry==1.4.2
140-
CROSSENV_WHEELS += Cython==0.29.34
141-
CROSSENV_WHEELS += flit==3.8.0
142-
CROSSENV_WHEELS += cryptography==40.0.2
138+
CROSSENV_WHEELS += cffi==1.15.1
139+
CROSSENV_WHEELS += poetry==1.5.1
140+
CROSSENV_WHEELS += Cython==0.29.35
141+
CROSSENV_WHEELS += flit==3.9.0
142+
CROSSENV_WHEELS += cryptography==41.0.1
143143
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
144-
CROSSENV_WHEELS += maturin==0.15.1
144+
CROSSENV_WHEELS += maturin==1.1.0
145145
endif
146146

147147
# Create the crossenv in preparation for

‎cross/python310/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.10.11.tar.xz SHA1 53eddc7bf687c4678dc594b2dc74126b48a4fa29
2-
Python-3.10.11.tar.xz SHA256 3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c
3-
Python-3.10.11.tar.xz MD5 1bf8481a683e0881e14d52e0f23633a6
1+
Python-3.10.12.tar.xz SHA1 85e043a6cd30835bdf95e3db2d1b4b15e142d067
2+
Python-3.10.12.tar.xz SHA256 afb74bf19130e7a47d10312c8f5e784f24e0527981eab68e20546cfb865830b8
3+
Python-3.10.12.tar.xz MD5 49b0342476b984e106d308c25d657f12

‎cross/python311/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python311
2-
PKG_VERS = 3.11.3
2+
PKG_VERS = 3.11.4
33
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
44
PKG_EXT = tar.xz
55
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -54,7 +54,7 @@ CONFIGURE_ARGS += ac_cv_file__dev_ptmx=no
5454
CONFIGURE_ARGS += ac_cv_file__dev_ptc=no
5555
CONFIGURE_ARGS += ac_cv_have_long_long_format=yes
5656

57-
DEPENDS += cross/openssl
57+
DEPENDS += cross/openssl3
5858
CONFIGURE_ARGS += --with-ssl-default-suites=openssl
5959

6060
DEPENDS += cross/gdbm
@@ -136,12 +136,12 @@ python311_install:
136136
CROSSENV_WHEELS = setuptools-rust==1.6.0
137137
CROSSENV_WHEELS += setuptools-scm==7.1.0
138138
CROSSENV_WHEELS += cffi==1.15.1
139-
CROSSENV_WHEELS += poetry==1.4.2
140-
CROSSENV_WHEELS += Cython==0.29.34
141-
CROSSENV_WHEELS += flit==3.8.0
142-
CROSSENV_WHEELS += cryptography==40.0.2
139+
CROSSENV_WHEELS += poetry==1.5.1
140+
CROSSENV_WHEELS += Cython==0.29.35
141+
CROSSENV_WHEELS += flit==3.9.0
142+
CROSSENV_WHEELS += cryptography==41.0.1
143143
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
144-
CROSSENV_WHEELS += maturin==0.15.1
144+
CROSSENV_WHEELS += maturin==1.1.0
145145
endif
146146

147147
# Create the crossenv in preparation for

‎cross/python311/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.11.3.tar.xz SHA1 baea3ce79cf35e53b4155a5f700516abcd14f49d
2-
Python-3.11.3.tar.xz SHA256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
3-
Python-3.11.3.tar.xz MD5 c8d52fc4fb8ad9932a11d86d142ee73a
1+
Python-3.11.4.tar.xz SHA1 413b3715d919a7b473281529ab91eeea5c82e632
2+
Python-3.11.4.tar.xz SHA256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
3+
Python-3.11.4.tar.xz MD5 fb7f7eae520285788449d569e45b6718

‎cross/python311/patches/88f6281/001-revert-static_assert_undefined-fix-GH-94766.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
--- Include/pymacro.h-orig 2023-06-06 22:00:27.000000000 +0000
2+
+++ Include/pymacro.h 2023-07-03 19:36:57.974496974 +0000
3+
@@ -3,23 +3,20 @@
4+
5+
// gh-91782: On FreeBSD 12, if the _POSIX_C_SOURCE and _XOPEN_SOURCE macros are
6+
// defined, <sys/cdefs.h> disables C11 support and <assert.h> does not define
7+
-// the static_assert() macro.
8+
+// the static_assert() macro. Define the static_assert() macro in Python until
9+
+// <sys/cdefs.h> suports C11:
10+
// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255290
11+
-//
12+
-// macOS <= 10.10 doesn't define static_assert in assert.h at all despite
13+
-// having C11 compiler support.
14+
-//
15+
-// static_assert is defined in glibc from version 2.16. Compiler support for
16+
-// the C11 _Static_assert keyword is in gcc >= 4.6.
17+
-//
18+
-// MSVC makes static_assert a keyword in C11-17, contrary to the standards.
19+
-//
20+
-// In C++11 and C2x, static_assert is a keyword, redefining is undefined
21+
-// behaviour. So only define if building as C (if __STDC_VERSION__ is defined),
22+
-// not C++, and only for C11-17.
23+
-#if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
24+
- && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
25+
- && __STDC_VERSION__ <= 201710L
26+
+#if defined(__FreeBSD__) && !defined(static_assert)
27+
+# define static_assert _Static_assert
28+
+#endif
29+
+
30+
+// static_assert is defined in glibc from version 2.16. Before it requires
31+
+// compiler support (gcc >= 4.6) and is called _Static_assert.
32+
+// In C++ 11 static_assert is a keyword, redefining is undefined behaviour.
33+
+#if (defined(__GLIBC__) \
34+
+ && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 16)) \
35+
+ && !(defined(__cplusplus) && __cplusplus >= 201103L) \
36+
+ && !defined(static_assert))
37+
# define static_assert _Static_assert
38+
#endif
39+

‎native/python310/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python310
2-
PKG_VERS = 3.10.11
2+
PKG_VERS = 3.10.12
33
PKG_EXT = tar.xz
44
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -37,7 +37,7 @@ python310_native_post_install: $(WORK_DIR)/python-native.mk
3737
@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
3838
@$(RUN) $(PYTHON) get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
3939
@$(MSG) Installing setuptools, wheel, cffi and cross env
40-
@$(PIP) --disable-pip-version-check install "setuptools==63.4.3" "setuptools-rust==1.6.0" "maturin==0.15.1" "wheel==0.40.0" "cffi==1.15.1" "crossenv==1.4.0"
40+
@$(PIP) --disable-pip-version-check install "setuptools==63.4.3" "setuptools-rust==1.6.0" "maturin==1.1.0" "wheel==0.40.0" "cffi==1.15.1" "crossenv==1.4.0"
4141

4242
$(WORK_DIR)/python-native.mk:
4343
@echo PIP=$(PIP_NATIVE) >> $@

‎native/python310/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.10.11.tar.xz SHA1 53eddc7bf687c4678dc594b2dc74126b48a4fa29
2-
Python-3.10.11.tar.xz SHA256 3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c
3-
Python-3.10.11.tar.xz MD5 1bf8481a683e0881e14d52e0f23633a6
1+
Python-3.10.12.tar.xz SHA1 85e043a6cd30835bdf95e3db2d1b4b15e142d067
2+
Python-3.10.12.tar.xz SHA256 afb74bf19130e7a47d10312c8f5e784f24e0527981eab68e20546cfb865830b8
3+
Python-3.10.12.tar.xz MD5 49b0342476b984e106d308c25d657f12

‎native/python311/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python311
2-
PKG_VERS = 3.11.3
2+
PKG_VERS = 3.11.4
33
PKG_EXT = tar.xz
44
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -37,7 +37,7 @@ python311_native_post_install: $(WORK_DIR)/python-native.mk
3737
@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
3838
@$(RUN) $(PYTHON) get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
3939
@$(MSG) Installing setuptools, wheel, cffi and cross env
40-
@$(PIP) --disable-pip-version-check install "setuptools==63.4.3" "setuptools-rust==1.6.0" "maturin==0.15.1" "wheel==0.40.0" "cffi==1.15.1" "crossenv==1.4.0"
40+
@$(PIP) --disable-pip-version-check install "setuptools==63.4.3" "setuptools-rust==1.6.0" "maturin==1.1.0" "wheel==0.40.0" "cffi==1.15.1" "crossenv==1.4.0"
4141

4242
$(WORK_DIR)/python-native.mk:
4343
@echo PIP=$(PIP_NATIVE) >> $@

‎native/python311/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.11.3.tar.xz SHA1 baea3ce79cf35e53b4155a5f700516abcd14f49d
2-
Python-3.11.3.tar.xz SHA256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
3-
Python-3.11.3.tar.xz MD5 c8d52fc4fb8ad9932a11d86d142ee73a
1+
Python-3.11.4.tar.xz SHA1 413b3715d919a7b473281529ab91eeea5c82e632
2+
Python-3.11.4.tar.xz SHA256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
3+
Python-3.11.4.tar.xz MD5 fb7f7eae520285788449d569e45b6718

‎spk/python310/Makefile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SPK_NAME = python310
2-
SPK_VERS = 3.10.11
2+
SPK_VERS = 3.10.12
33
SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
4-
SPK_REV = 15
4+
SPK_REV = 16
55
SPK_ICON = src/python3.png
66

77
DEPENDS = cross/$(SPK_NAME)
@@ -13,7 +13,7 @@ DESCRIPTION_FRE = Language de programmation Python.
1313
DESCRIPTION_SPN = Lenguaje de programación Python.
1414
STARTABLE = no
1515
DISPLAY_NAME = Python 3.10
16-
CHANGELOG = "1. Update to Python 3.10.11"
16+
CHANGELOG = "1. Update to Python 3.10.12<br/>2. Update to OpenSSL 3.1.1"
1717

1818
HOMEPAGE = https://www.python.org
1919
LICENSE = PSF
@@ -113,10 +113,13 @@ include ../../mk/spksrc.spk.mk
113113
ifeq ($(strip $(WHEELS_TEST_ALL)),1)
114114

115115
# [greenlet]
116-
ifeq ($(call version_ge, $(TC_GCC), 7.5),1)
117-
WHEELS += src/requirements-crossenv-greenlet.txt
116+
ifeq ($(call version_ge, $(TC_GCC), 4.9),1)
117+
WHEELS += src/requirements-crossenv-greenlet-v2.txt
118+
ifeq ($(call version_lt, $(TC_GCC), 5.0),1)
119+
WHEELS_CPPFLAGS += [greenlet] -std=c++11
120+
endif
118121
else
119-
WHEELS += src/requirements-crossenv-greenlet-gcc4.txt
122+
WHEELS += src/requirements-crossenv-greenlet-v1.txt
120123
endif
121124

122125
# [numpy] <= 1.21.6 (armv5)
@@ -127,7 +130,10 @@ WHEELS += src/requirements-crossenv-numpy-armv5.txt
127130
# [numpy] <= 1.22.4 (armv7l)
128131
else ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
129132
WHEELS += src/requirements-crossenv-numpy-armv7l.txt
130-
else
133+
else ifeq ($(call version_le, $(TC_GCC), 5.0),1)
134+
WHEELS += src/requirements-crossenv-numpy-gcc4.txt
135+
# [numpy] >= 1.25.0 requires c++17
136+
else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
131137
WHEELS += src/requirements-crossenv-numpy.txt
132138
endif
133139
# workaround for compiler bug:

‎spk/python310/src/requirements-abi3.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
# Require:
99
# - CFLAGS=-sdt=c99 < gcc-4.9
1010
# - CFLAGS=-sdt=c11 >= gcc-4.9
11-
pycryptodome==3.17
12-
pycryptodomex==3.17
11+
pycryptodome==3.18
12+
pycryptodomex==3.18

‎spk/python310/src/requirements-crossenv-greenlet-gcc4.txt renamed to ‎spk/python310/src/requirements-crossenv-greenlet-v1.txt

File renamed without changes.

‎spk/python310/src/requirements-crossenv-greenlet.txt renamed to ‎spk/python310/src/requirements-crossenv-greenlet-v2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
##
66

77
# [greenlet]
8-
# - Mandatory require full c++11 support (DSM7)
8+
# - Mandatory require full c++11 support
99
greenlet==2.0.2

‎spk/python310/src/requirements-crossenv-numpy-gcc4.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
##
2+
## All configurations below are optional and
3+
## are provided to demonstrate how to build
4+
## various wheels. Uncoment to enable.
5+
##
6+
7+
# [numpy]
8+
# - Require Cython in cross/python311 crossenv
9+
# - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
10+
# ref: https://github.com/numpy/numpy/issues/13622
11+
numpy==1.23.5
12+
numpy==1.24.4

‎spk/python310/src/requirements-crossenv-numpy.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# [numpy]
88
# - Require Cython in cross/python310 crossenv
9-
# - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
10-
# ref: https://github.com/numpy/numpy/issues/13622
11-
#numpy==1.23.5
12-
numpy==1.24.3
9+
# - Numpy 1.25.x require c++17
10+
numpy==1.23.5
11+
numpy==1.24.4
12+
numpy==1.25.0

‎spk/python310/src/requirements-crossenv.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bcrypt==4.0.1
1515
# https://docs.rs/openssl/latest/openssl/#automatic
1616
# ENV += OPENSSL_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/
1717
# ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
18-
cryptography==40.0.2
18+
cryptography==41.0.1
1919

2020
# Requirement for cryptography
2121
cffi==1.15.1
@@ -25,12 +25,12 @@ cffi==1.15.1
2525
# with local python apps requirements
2626

2727
immutables==0.19
28-
MarkupSafe==2.1.2
28+
MarkupSafe==2.1.3
2929
msgpack-python==0.5.6
3030
netifaces==0.11.0
3131
psutil==5.9.5
32-
regex==2023.5.5
33-
SQLAlchemy==2.0.12
32+
regex==2023.6.3
33+
SQLAlchemy==2.0.17
3434
zope.interface==6.0
3535

3636
# [gevent]
@@ -49,7 +49,7 @@ lxml==4.9.2
4949
# Require environment variables
5050
# MYSQLCLIENT_CFLAGS
5151
# MYSQLCLIENT_LDFLAGS
52-
mysqlclient==2.1.1
52+
mysqlclient==2.2.0
5353

5454
# [Pillow]
5555
# Require --global-options arguments
@@ -85,7 +85,7 @@ git+https://github.com/totaam/rencode.git@f6254ab26161f90b9c5e97915b9193fee805fc
8585

8686
# [ujson]
8787
# - Require setuptools-scm in cross/python3* crossenv
88-
ujson==5.7.0
88+
ujson==5.8.0
8989

9090
# [webrtcvad]
9191
# webrtcvad==2.0.10 # requires unreleased version at specific commit for qoriq arch

0 commit comments

Comments
 (0)