python v3.12.5 (#696)

automerged PR by conda-forge/automerge-action
conda-forge · Aug 8, 2024 · 27ebc9f · 27ebc9f
2 parents c4bb3c9 + 8001887
commit 27ebc9f
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 92 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml
@@ -9,9 +9,9 @@ c_compiler_version:
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml
@@ -9,9 +9,9 @@ c_compiler_version:
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml
@@ -25,7 +25,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 expat:
 - '2'
 libffi:

diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml
@@ -25,7 +25,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 expat:
 - '2'
 libffi:

diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 expat:
 - '2'
 libffi:

diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 expat:
 - '2'
 libffi:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,4 +1,4 @@
-build_platform: {osx_arm64: osx_64}
+build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64}
 conda_forge_output_validation: true
 provider: {linux_aarch64: default, linux_ppc64le: native}
 bot:

diff --git a/recipe/build_base.sh b/recipe/build_base.sh
@@ -152,12 +152,12 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
   BUILD_PYTHON_PREFIX=${PWD}/build-python-install
   mkdir build-python-build
   pushd build-python-build
-    (unset CPPFLAGS;
-     export CC=${CC_FOR_BUILD} \
+    (export CC=${CC_FOR_BUILD} \
             CXX=${CXX_FOR_BUILD} \
             CPP="${CC_FOR_BUILD} -E" \
-            CFLAGS="-O2" \
-	    LDFLAGS=${LDFLAGS//${PREFIX}/${CONDA_PREFIX}} \
+            CFLAGS="-O2 -I${BUILD_PREFIX}/include" \
+            CPPFLAGS="-O2 -I${BUILD_PREFIX}/include" \
+	    LDFLAGS=${LDFLAGS//${PREFIX}/${BUILD_PREFIX}} \
 	    PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig \
             AR="$(${CC_FOR_BUILD} --print-prog-name=ar)" \
             RANLIB="$(${CC_FOR_BUILD} --print-prog-name=ranlib)" \
@@ -174,15 +174,17 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
     ln -s ${BUILD_PYTHON_PREFIX}/bin/python${VER} ${BUILD_PYTHON_PREFIX}/bin/python
   popd
   echo "ac_cv_file__dev_ptmx=yes"        > config.site
-  echo "ac_cv_file__dev_ptc=yes"        >> config.site
+  echo "ac_cv_file__dev_ptc=no"         >> config.site
   echo "ac_cv_pthread=yes"              >> config.site
   echo "ac_cv_little_endian_double=yes" >> config.site
-  if [[ ${target_platform} == osx-arm64 ]]; then
+  if [[ "${target_platform}" == "osx-arm64" || "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then
       echo "ac_cv_aligned_required=no" >> config.site
-      echo "ac_cv_file__dev_ptc=no" >> config.site
       echo "ac_cv_pthread_is_default=yes" >> config.site
       echo "ac_cv_working_tzset=yes" >> config.site
       echo "ac_cv_pthread_system_supported=yes" >> config.site
+  else
+      echo "unknown cross compiling platform"
+      exit 1
   fi
   export CONFIG_SITE=${PWD}/config.site
   # This is needed for libffi:

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "3.12.4" %}
+{% set version = "3.12.5" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -46,7 +46,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
-    md5: d68f25193eec491eb54bc2ea664a05bd
+    md5: 02c7d269e077f4034963bba6befdc715
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -160,10 +160,19 @@ outputs:
 {% if 'conda-forge' in channel_targets %}
         - binutils_impl_{{ target_platform }}  # [linux]
 {% endif %}
-        - tk        # [build_platform != target_platform]
-        - readline  # [build_platform != target_platform]
-        - ncurses   # [build_platform != target_platform]
-        - zlib      # [build_platform != target_platform]
+        - bzip2         # [build_platform != target_platform]
+        - sqlite        # [build_platform != target_platform]
+        - xz            # [build_platform != target_platform]
+        - zlib          # [build_platform != target_platform]
+        - openssl       # [build_platform != target_platform]
+        - readline      # [not win and build_platform != target_platform]
+        - tk            # [build_platform != target_platform]
+        - ncurses       # [unix and build_platform != target_platform]
+        - libffi        # [build_platform != target_platform]
+        - libnsl        # [linux and build_platform != target_platform]
+        - libuuid       # [linux and build_platform != target_platform]
+        - libxcrypt     # [linux and build_platform != target_platform]
+        - expat         # [build_platform != target_platform]
       host:
         - bzip2
         - sqlite

diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch
@@ -27,9 +27,14 @@ new file mode 100755
 index 0000000000..14f84a8597
 --- /dev/null
 +++ b/if_runnable.sh
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,10 @@
 +#!/bin/bash
 +
 +if [[ "${target_platform}" == "${build_platform}" || "${CROSSCOMPILING_EMULATOR:-}" != "" ]]; then
-+    exec $*
++  if [[ "$1" == "./"* ]]; then
++    exec $@
++  else
++    export ${@:1:$#-2}
++    exec ${@: -2}
++  fi
 +fi
diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt
@@ -1,5 +1,3 @@
-libx11
-libXext-devel
-libXrender-devel	
-libSM-devel	
-libX11-devel
+libX11
+libxcb
+libxau