From a5eb355203e3025fd398ccfe541125dafdfd16ba Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 3 Dec 2024 02:10:21 +0000 Subject: [PATCH] python31*-wheels: various adjustments --- .../src/requirements-crossenv-greenlet-v32.txt | 9 --------- spk/python311-wheels/src/requirements-crossenv-numpy.txt | 4 ++-- spk/python311-wheels/src/requirements-crossenv.txt | 6 ++++-- spk/python312-wheels/src/requirements-crossenv-numpy.txt | 4 +++- spk/python312-wheels/src/requirements-crossenv.txt | 6 ++++-- 5 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 spk/python311-wheels/src/requirements-crossenv-greenlet-v32.txt diff --git a/spk/python311-wheels/src/requirements-crossenv-greenlet-v32.txt b/spk/python311-wheels/src/requirements-crossenv-greenlet-v32.txt deleted file mode 100644 index c2b4802c7ad..00000000000 --- a/spk/python311-wheels/src/requirements-crossenv-greenlet-v32.txt +++ /dev/null @@ -1,9 +0,0 @@ -## -## All configurations below are optional and -## are provided to demonstrate how to build -## various wheels. Uncoment to enable. -## - -# [greenlet] -# - Mandatory require full c++11 support -greenlet==3.0.3 diff --git a/spk/python311-wheels/src/requirements-crossenv-numpy.txt b/spk/python311-wheels/src/requirements-crossenv-numpy.txt index 23ffee217ce..60f1dd705bd 100644 --- a/spk/python311-wheels/src/requirements-crossenv-numpy.txt +++ b/spk/python311-wheels/src/requirements-crossenv-numpy.txt @@ -11,6 +11,6 @@ # c++17, meson-python, scikit-build-core numpy==1.24.4 numpy==1.25.1 -numpy==1.26.4 -numpy==2.0.2 +#numpy==1.26.4 +#numpy==2.0.2 numpy==2.1.3 diff --git a/spk/python311-wheels/src/requirements-crossenv.txt b/spk/python311-wheels/src/requirements-crossenv.txt index 0e66cb93829..20bbba27003 100644 --- a/spk/python311-wheels/src/requirements-crossenv.txt +++ b/spk/python311-wheels/src/requirements-crossenv.txt @@ -15,10 +15,12 @@ bcrypt==4.2.0 # https://docs.rs/openssl/latest/openssl/#automatic # ENV += OPENSSL_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ # ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ -cryptography==43.0.1 +cryptography==43.0.3 +cryptography==44.0.0 # Requirement for cryptography -cffi==1.17.0 +cffi==1.15.1 +cffi==1.17.1 # commonly used cross-compiled wheels # All tested and can be enabled but may conflict diff --git a/spk/python312-wheels/src/requirements-crossenv-numpy.txt b/spk/python312-wheels/src/requirements-crossenv-numpy.txt index 46e88a79f22..9e5b9788cf4 100644 --- a/spk/python312-wheels/src/requirements-crossenv-numpy.txt +++ b/spk/python312-wheels/src/requirements-crossenv-numpy.txt @@ -11,4 +11,6 @@ numpy==2.1.3 numpy==2.0.2 numpy==1.26.4 -numpy==1.25.1 + +# unsupported +#numpy==1.25.2 diff --git a/spk/python312-wheels/src/requirements-crossenv.txt b/spk/python312-wheels/src/requirements-crossenv.txt index 8bdbfaa2d62..b38782a4790 100644 --- a/spk/python312-wheels/src/requirements-crossenv.txt +++ b/spk/python312-wheels/src/requirements-crossenv.txt @@ -15,10 +15,12 @@ bcrypt==4.2.0 # https://docs.rs/openssl/latest/openssl/#automatic # ENV += OPENSSL_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ # ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ -cryptography==43.0.1 +cryptography==43.0.3 +cryptography==44.0.0 # Requirement for cryptography -cffi==1.17.0 +cffi==1.15.1 +cffi==1.17.1 # commonly used cross-compiled wheels # All tested and can be enabled but may conflict