diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 0e59bcc0..8b328015 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 4ce6895f..d1d4ed61 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 976f7378..eda61c01 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 21f44cb1..dc49e8c8 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index a838d66f..477a56c8 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 6c2d4025..5b08ac42 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 8d84461f..c6ce4051 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 9974fe56..61ab3f8a 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 39ca0a5b..eaca6206 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 92b13440..a7735403 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index a56edc85..3c48ee29 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index a0bc0da5..3b024617 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 34fac3d7..0ab28034 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index c9b4e589..5b6e7e35 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 5f3d9515..11c4b5cb 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index f617ec7f..3bef5bc2 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index f3120928..73d8cb63 100644 --- a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 103426e5..84370009 100644 --- a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index c3b2eb07..84b04992 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 8b2463ee..866404cf 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' freethreading: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 837e09f1..3a0db7a3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 26c31365..420f051c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7a6d8abd..65650bf2 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration diff --git a/README.md b/README.md index e8b8effa..29c78eb9 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,26 @@ fewer lines of code than would be possible in languages such as C++ or Java. The language provides constructs intended to enable clear programs on both a small and large scale. +We provide some meta packages for convenience. +To get a CPython flavour, use + + conda install cpython + +To get the freethreading build (i.e. without the Global Interpreter Lock - GIL) + + conda install python-freethreading + +To get the default build (i.e. with the GIL) + + conda install python-gil + +To enable the use of the experimental JIT compiler in CPython + + conda install python-jit + +or set the environment variable PYTHON_JIT=1. Note that the JIT support +is available for x86_64 builds only. + Current build status ==================== @@ -206,9 +226,11 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-cpython-green.svg)](https://anaconda.org/conda-forge/cpython) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/cpython.svg)](https://anaconda.org/conda-forge/cpython) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/cpython.svg)](https://anaconda.org/conda-forge/cpython) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/cpython.svg)](https://anaconda.org/conda-forge/cpython) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-cpython--jit-green.svg)](https://anaconda.org/conda-forge/cpython-jit) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/cpython-jit.svg)](https://anaconda.org/conda-forge/cpython-jit) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/cpython-jit.svg)](https://anaconda.org/conda-forge/cpython-jit) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/cpython-jit.svg)](https://anaconda.org/conda-forge/cpython-jit) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-cpython--gil-green.svg)](https://anaconda.org/conda-forge/cpython-gil) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/cpython-gil.svg)](https://anaconda.org/conda-forge/cpython-gil) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/cpython-gil.svg)](https://anaconda.org/conda-forge/cpython-gil) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/cpython-gil.svg)](https://anaconda.org/conda-forge/cpython-gil) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libpython--static-green.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python-green.svg)](https://anaconda.org/conda-forge/python) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-python--freethreading-green.svg)](https://anaconda.org/conda-forge/python-freethreading) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-freethreading.svg)](https://anaconda.org/conda-forge/python-freethreading) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-freethreading.svg)](https://anaconda.org/conda-forge/python-freethreading) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-freethreading.svg)](https://anaconda.org/conda-forge/python-freethreading) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-python--jit-green.svg)](https://anaconda.org/conda-forge/python-jit) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-jit.svg)](https://anaconda.org/conda-forge/python-jit) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-jit.svg)](https://anaconda.org/conda-forge/python-jit) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-jit.svg)](https://anaconda.org/conda-forge/python-jit) | Installing python ================= @@ -220,16 +242,16 @@ conda config --add channels conda-forge/label/python_debug conda config --set channel_priority strict ``` -Once the `conda-forge/label/python_debug` channel has been enabled, `cpython, cpython-jit, libpython-static, python` can be installed with `conda`: +Once the `conda-forge/label/python_debug` channel has been enabled, `cpython, cpython-gil, libpython-static, python, python-freethreading, python-jit` can be installed with `conda`: ``` -conda install cpython cpython-jit libpython-static python +conda install cpython cpython-gil libpython-static python python-freethreading python-jit ``` or with `mamba`: ``` -mamba install cpython cpython-jit libpython-static python +mamba install cpython cpython-gil libpython-static python python-freethreading python-jit ``` It is possible to list all of the versions of `cpython` available on your platform with `conda`: diff --git a/build-locally.py b/build-locally.py index d78427b5..8ac9b846 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform diff --git a/conda-forge.yml b/conda-forge.yml index ed615d97..8dccb6ca 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -15,5 +15,4 @@ github: tooling_branch_name: main conda_build: pkg_format: '2' -remote_ci_setup: [conda-forge-ci-setup=3] test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3a69fd8f..3ab2e44d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ {% set version = "3.13.0" %} -{% set dev = "rc1" %} +{% set dev = "rc2" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 2 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -38,7 +38,7 @@ package: source: - 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: 9213ecfedc510ac2a14c0eeea96baf02 + md5: 8ace0094cf8698daf5328a2819ab0376 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 7d36d88d..dd0b409d 100644 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,4 +1,4 @@ -From 7178343ae96f9cfebfb5eef9b46a6a955173394c Mon Sep 17 00:00:00 2001 +From c9901a12102f3f9e7d935246cff778acf6173b64 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/23] Win32: Change FD_SETSIZE from 512 to 2048 @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index 5bd9b7732a..504f79e899 100644 +index 5bd9b7732a4..504f79e8998 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -45,7 +45,7 @@ diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index e3b87130..a78bfe41 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,4 +1,4 @@ -From e3cf4b7cc0c94751c96e9366ee755e4fc46152ee Mon Sep 17 00:00:00 2001 +From 576825190fa0ba2f79082dc169db4f848f9f5522 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/23] Win32: Do not download externals @@ -8,7 +8,7 @@ Subject: [PATCH 02/23] Win32: Do not download externals 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index 6c76f09a07..3dc802b8ce 100644 +index 6c76f09a071..3dc802b8cef 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -102,7 +102,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 01ecc4a4..9da06e32 100644 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,4 +1,4 @@ -From 736883361dfffbe7330c221cb259c20c0f28b65a Mon Sep 17 00:00:00 2001 +From 34fc7767b7e1853fd6918895b9e815cfe3185045 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/23] Fix find_library so that it looks in sys.prefix/lib @@ -10,7 +10,7 @@ Subject: [PATCH 03/23] Fix find_library so that it looks in sys.prefix/lib 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index 583c47daff..ab9b01c87e 100644 +index 583c47daff3..ab9b01c87e2 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None): @@ -25,7 +25,7 @@ index 583c47daff..ab9b01c87e 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 117bf06cb0..2e9fa474ac 100644 +index 117bf06cb01..2e9fa474ace 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ def find_library(name): diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index fffa439f..22910e44 100644 --- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,4 +1,4 @@ -From 6fb5ee0171f592da6888e71fe0a05581fffaae43 Mon Sep 17 00:00:00 2001 +From 71a937431526f656cbbd61fe3a93259b42cf41d0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/23] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS @@ -11,7 +11,7 @@ Co-authored-by: Isuru Fernando 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/getpath.c b/Modules/getpath.c -index d0128b20fa..e7cfeba25e 100644 +index d0128b20fae..e7cfeba25ec 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -945,6 +945,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) @@ -23,7 +23,7 @@ index d0128b20fa..e7cfeba25e 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index 1f1bfcb4f6..344900c05e 100644 +index 1f1bfcb4f64..344900c05e7 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 518d4346..8690a18e 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 9b09680cddf6efce8bc7f4ca62b7f31cd5b5eb62 Mon Sep 17 00:00:00 2001 +From 5db18ef4700c2ccb38b22304fdf3b3f49ddc9742 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/23] Unvendor openssl @@ -15,7 +15,7 @@ Co-authored-by: Isuru Fernando 7 files changed, 12 insertions(+), 87 deletions(-) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index d4e1affab0..ce21f992ff 100644 +index d4e1affab03..ce21f992ff8 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -99,9 +99,6 @@ @@ -29,7 +29,7 @@ index d4e1affab0..ce21f992ff 100644 diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters -index 716a69a41a..7e8e5800a0 100644 +index 716a69a41af..7e8e5800a0d 100644 --- a/PCbuild/_ssl.vcxproj.filters +++ b/PCbuild/_ssl.vcxproj.filters @@ -12,13 +12,10 @@ @@ -49,7 +49,7 @@ index 716a69a41a..7e8e5800a0 100644 \ No newline at end of file + diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 5fd708b211..044cefd95e 100644 +index 5fd708b211e..044cefd95ea 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -2,10 +2,10 @@ @@ -81,7 +81,7 @@ index 5fd708b211..044cefd95e 100644 - diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 0da6f67495..b79f35b2c7 100644 +index 0da6f674958..b79f35b2c7d 100644 --- a/PCbuild/openssl.vcxproj +++ b/PCbuild/openssl.vcxproj @@ -60,64 +60,8 @@ @@ -157,7 +157,7 @@ index 0da6f67495..b79f35b2c7 100644 \ No newline at end of file + diff --git a/PCbuild/python.props b/PCbuild/python.props -index 86fe8531d7..0ec0914fac 100644 +index c8ecdb4515a..0ec0914facd 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -61,6 +61,7 @@ @@ -179,8 +179,8 @@ index 86fe8531d7..0ec0914fac 100644 - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include $(ExternalsDir)\mpdecimal-4.0.0\ -- $(ExternalsDir)openssl-3.0.13\ -- $(ExternalsDir)openssl-bin-3.0.13\$(ArchName)\ +- $(ExternalsDir)openssl-3.0.15\ +- $(ExternalsDir)openssl-bin-3.0.15\$(ArchName)\ - $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ - $(ExternalsDir)\zlib-1.3.1\ @@ -188,7 +188,7 @@ index 86fe8531d7..0ec0914fac 100644 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 4a99ffc677..b11fb61796 100644 +index 4a99ffc677c..b11fb617963 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -110,6 +110,9 @@ @@ -202,7 +202,7 @@ index 4a99ffc677..b11fb61796 100644 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index d08c210ef8..58a9e852be 100644 +index d08c210ef8a..58a9e852bed 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -102,6 +102,9 @@ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index e48ceeac..192fef8d 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 0c234591237306b0d24320fcddcb35275f0866f9 Mon Sep 17 00:00:00 2001 +From 8c8f84b74311ad8555090419db43fbc73012220f Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/23] Unvendor sqlite3 @@ -10,7 +10,7 @@ Subject: [PATCH 06/23] Unvendor sqlite3 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 9ae0a0fc3a..f482734ba1 100644 +index 9ae0a0fc3a0..f482734ba1d 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -93,9 +93,12 @@ @@ -43,7 +43,7 @@ index 9ae0a0fc3a..f482734ba1 100644 \ No newline at end of file + diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index d10e1c46a9..7516820de8 100644 +index d10e1c46a91..7516820de82 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -71,8 +71,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtre @@ -56,7 +56,7 @@ index d10e1c46a9..7516820de8 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index 6bcc4e913c..9fe4bb740a 100644 +index 6bcc4e913c8..9fe4bb740ab 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -88,12 +88,12 @@ diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index bf5ac235..094a2653 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 549322421754214dfdbc456a51c77d6f64947d16 Mon Sep 17 00:00:00 2001 +From 7f6c5a40be88d1c9c2bed791988925f4e2368e9a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/23] Add CondaEcosystemModifyDllSearchPath() @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando 1 file changed, 96 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 13bd62da4d..d68bd42a9f 100644 +index 1701a1cd217..e9dba44f800 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -60,6 +60,10 @@ @@ -48,7 +48,7 @@ index 13bd62da4d..d68bd42a9f 100644 #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str)) @@ -106,6 +110,94 @@ __attribute__ ((section (".PyRuntime"))) - = _PyRuntimeState_INIT(_PyRuntime); + = _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie); _Py_COMP_DIAG_POP +#ifdef MS_WINDOWS diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 95894d56..8cfd5917 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From dd7a7668da8a8a9e9ccc4d8062fb74be19763400 Mon Sep 17 00:00:00 2001 +From 6aa8cdebfd6c851af34a37c39cd4b85cd94998c9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/23] Doing d1trimfile @@ -48,7 +48,7 @@ Subject: [PATCH 08/23] Doing d1trimfile 41 files changed, 368 insertions(+), 20 deletions(-) diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj -index 76b0ffd660..1402860e19 100644 +index 76b0ffd660d..1402860e19b 100644 --- a/PCbuild/_asyncio.vcxproj +++ b/PCbuild/_asyncio.vcxproj @@ -91,6 +91,26 @@ @@ -79,7 +79,7 @@ index 76b0ffd660..1402860e19 100644 diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index e0dc6ec187..30ad0dc486 100644 +index e0dc6ec187a..30ad0dc4864 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -97,6 +97,10 @@ @@ -101,7 +101,7 @@ index e0dc6ec187..30ad0dc486 100644 \ No newline at end of file + diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj -index 63d5fa49cd..6329f3d960 100644 +index 63d5fa49cd4..6329f3d960f 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -95,6 +95,10 @@ @@ -116,7 +116,7 @@ index 63d5fa49cd..6329f3d960 100644 /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj -index 97354739c0..b200d59290 100644 +index 97354739c09..b200d592906 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -92,6 +92,26 @@ @@ -154,7 +154,7 @@ index 97354739c0..b200d59290 100644 \ No newline at end of file + diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index ee7421484b..e9d60b4db1 100644 +index ee7421484b5..e9d60b4db1a 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -99,6 +99,10 @@ @@ -169,7 +169,7 @@ index ee7421484b..e9d60b4db1 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 8c9c0e42f7..94da21f642 100644 +index 8c9c0e42f7f..94da21f6425 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -186,7 +186,7 @@ index 8c9c0e42f7..94da21f642 100644 diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj -index e5e18de60e..f9757290b2 100644 +index e5e18de60ec..f9757290b2e 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -92,6 +92,10 @@ @@ -201,7 +201,7 @@ index e5e18de60e..f9757290b2 100644 Console diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj -index 2cd205224b..1ff3a9cdec 100644 +index 2cd205224bc..1ff3a9cdeca 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -96,6 +96,18 @@ @@ -224,7 +224,7 @@ index 2cd205224b..1ff3a9cdec 100644 diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 40107d4b76..321f41d8d2 100644 +index 40107d4b76c..321f41d8d27 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -95,6 +95,10 @@ @@ -239,7 +239,7 @@ index 40107d4b76..321f41d8d2 100644 $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj -index a65397f532..451ca37599 100644 +index a65397f532a..451ca375990 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -95,6 +95,18 @@ @@ -269,7 +269,7 @@ index a65397f532..451ca37599 100644 \ No newline at end of file + diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj -index 224bf05d53..f7efa63f56 100644 +index 224bf05d530..f7efa63f562 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -95,6 +95,18 @@ @@ -299,7 +299,7 @@ index 224bf05d53..f7efa63f56 100644 \ No newline at end of file + diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj -index 80a1c3c6a4..8d4555299a 100644 +index 80a1c3c6a4a..8d4555299ae 100644 --- a/PCbuild/_queue.vcxproj +++ b/PCbuild/_queue.vcxproj @@ -91,6 +91,26 @@ @@ -330,7 +330,7 @@ index 80a1c3c6a4..8d4555299a 100644 diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj -index 41af089592..45ecbcc464 100644 +index 41af0895921..45ecbcc4641 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -95,6 +95,18 @@ @@ -360,7 +360,7 @@ index 41af089592..45ecbcc464 100644 \ No newline at end of file + diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index f482734ba1..70943daa02 100644 +index f482734ba1d..70943daa021 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -95,6 +95,10 @@ @@ -375,7 +375,7 @@ index f482734ba1..70943daa02 100644 $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index ce21f992ff..34561515c1 100644 +index ce21f992ff8..34561515c12 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -398,7 +398,7 @@ index ce21f992ff..34561515c1 100644 diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj -index 4e721e8ce0..3fec7516ed 100644 +index 4e721e8ce09..3fec7516ed5 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -92,6 +92,26 @@ @@ -436,7 +436,7 @@ index 4e721e8ce0..3fec7516ed 100644 \ No newline at end of file + diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 44dbf23481..ec791cfe60 100644 +index 44dbf234813..ec791cfe60c 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ @@ -467,7 +467,7 @@ index 44dbf23481..ec791cfe60 100644 diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj -index 69d312b17a..bee3326ef8 100644 +index 69d312b17a5..bee3326ef8d 100644 --- a/PCbuild/_testconsole.vcxproj +++ b/PCbuild/_testconsole.vcxproj @@ -92,6 +92,10 @@ @@ -489,7 +489,7 @@ index 69d312b17a..bee3326ef8 100644 \ No newline at end of file + diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj -index a7ea8787e0..e8edb3dd75 100644 +index a7ea8787e0c..e8edb3dd752 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -89,6 +89,10 @@ @@ -511,7 +511,7 @@ index a7ea8787e0..e8edb3dd75 100644 \ No newline at end of file + diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj -index c35ac83c1c..c9d7f5d22b 100644 +index c35ac83c1c7..c9d7f5d22b7 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -92,6 +92,26 @@ @@ -542,7 +542,7 @@ index c35ac83c1c..c9d7f5d22b 100644 diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj -index 87db569423..c91bc1a2b9 100644 +index 87db569423d..c91bc1a2b96 100644 --- a/PCbuild/_testinternalcapi.vcxproj +++ b/PCbuild/_testinternalcapi.vcxproj @@ -92,6 +92,26 @@ @@ -573,7 +573,7 @@ index 87db569423..c91bc1a2b9 100644 diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj -index e730fe308a..a6f13ef31d 100644 +index e730fe308ab..a6f13ef31dc 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -92,6 +92,10 @@ @@ -595,7 +595,7 @@ index e730fe308a..a6f13ef31d 100644 \ No newline at end of file + diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 117488a016..5ca877b5f2 100644 +index 117488a0162..5ca877b5f2e 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -96,6 +96,10 @@ @@ -617,7 +617,7 @@ index 117488a016..5ca877b5f2 100644 \ No newline at end of file + diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj -index 4dd42ab98a..7c2dbc7e70 100644 +index 4dd42ab98a9..7c2dbc7e701 100644 --- a/PCbuild/liblzma.vcxproj +++ b/PCbuild/liblzma.vcxproj @@ -94,6 +94,10 @@ @@ -632,7 +632,7 @@ index 4dd42ab98a..7c2dbc7e70 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index dc9161a8b2..3bcef600a3 100644 +index dc9161a8b29..3bcef600a3e 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -647,7 +647,7 @@ index dc9161a8b2..3bcef600a3 100644 diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj -index 35f2f7e505..02d7961c5d 100644 +index 35f2f7e505b..02d7961c5d8 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -93,6 +93,10 @@ @@ -662,7 +662,7 @@ index 35f2f7e505..02d7961c5d 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj -index ea432d6bc9..50397324a2 100644 +index ea432d6bc9a..50397324a20 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -92,6 +92,10 @@ @@ -684,7 +684,7 @@ index ea432d6bc9..50397324a2 100644 \ No newline at end of file + diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index b11fb61796..dacf01e264 100644 +index b11fb617963..dacf01e264f 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -92,6 +92,10 @@ @@ -699,7 +699,7 @@ index b11fb61796..dacf01e264 100644 Console diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj -index 235ea1cf9d..d861f6c6a4 100644 +index 235ea1cf9d3..d861f6c6a43 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -93,6 +93,10 @@ @@ -721,7 +721,7 @@ index 235ea1cf9d..d861f6c6a4 100644 \ No newline at end of file + diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj -index fb27e9e712..f8dc841ef1 100644 +index fb27e9e7122..f8dc841ef1b 100644 --- a/PCbuild/python_uwp.vcxproj +++ b/PCbuild/python_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -734,7 +734,7 @@ index fb27e9e712..f8dc841ef1 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 70212903c8..b85cca2cd5 100644 +index 70212903c83..b85cca2cd51 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ @@ -747,7 +747,7 @@ index 70212903c8..b85cca2cd5 100644 $(zlibDir);%(AdditionalIncludeDirectories) _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 58a9e852be..ce6e35477b 100644 +index 58a9e852bed..ce6e35477bf 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -96,6 +96,18 @@ @@ -770,7 +770,7 @@ index 58a9e852be..ce6e35477b 100644 diff --git a/PCbuild/pythonw_uwp.vcxproj b/PCbuild/pythonw_uwp.vcxproj -index e21e46a1b7..ff7dc6635d 100644 +index e21e46a1b72..ff7dc6635df 100644 --- a/PCbuild/pythonw_uwp.vcxproj +++ b/PCbuild/pythonw_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -783,7 +783,7 @@ index e21e46a1b7..ff7dc6635d 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj -index e50b69aefe..d64a06b5e6 100644 +index e50b69aefe2..d64a06b5e6e 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -805,7 +805,7 @@ index e50b69aefe..d64a06b5e6 100644 \ No newline at end of file + diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj -index d7448fd4d7..9fab5e8a63 100644 +index d7448fd4d72..9fab5e8a638 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -94,6 +94,18 @@ @@ -835,7 +835,7 @@ index d7448fd4d7..9fab5e8a63 100644 \ No newline at end of file + diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj -index 781f938e2a..3870c85adf 100644 +index 781f938e2ab..3870c85adf7 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -91,6 +91,26 @@ @@ -873,7 +873,7 @@ index 781f938e2a..3870c85adf 100644 \ No newline at end of file + diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj -index 1193e03224..6855845d13 100644 +index 1193e032245..6855845d131 100644 --- a/PCbuild/venvlauncher.vcxproj +++ b/PCbuild/venvlauncher.vcxproj @@ -94,6 +94,10 @@ @@ -888,7 +888,7 @@ index 1193e03224..6855845d13 100644 PY_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index 1b61718201..4eecc214aa 100644 +index 1b617182013..4eecc214aa5 100644 --- a/PCbuild/venvwlauncher.vcxproj +++ b/PCbuild/venvwlauncher.vcxproj @@ -94,6 +94,10 @@ @@ -903,7 +903,7 @@ index 1b61718201..4eecc214aa 100644 PYW_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj -index c26029b15a..1e543b31c4 100644 +index c26029b15a3..1e543b31c41 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -96,6 +96,18 @@ @@ -933,7 +933,7 @@ index c26029b15a..1e543b31c4 100644 \ No newline at end of file + diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj -index 093e6920c0..19dd43c19c 100644 +index 093e6920c0b..19dd43c19c2 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -93,6 +93,12 @@ @@ -950,7 +950,7 @@ index 093e6920c0..19dd43c19c 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj -index 3f4d4463f2..2572449ba0 100644 +index 3f4d4463f24..2572449ba0c 100644 --- a/PCbuild/xxlimited_35.vcxproj +++ b/PCbuild/xxlimited_35.vcxproj @@ -93,6 +93,12 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index dbc2ef1d..a34c049e 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From a8e5a682c72ddd09f434e1cf6cdaa853c4e07f93 Mon Sep 17 00:00:00 2001 +From 7f3dca2b5ec07180b3e3261ee5ebdea9322425dc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/23] cross compile darwin @@ -11,7 +11,7 @@ By Isuru Fernando. 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 5958382276..44264f0c81 100755 +index 5958382276e..44264f0c812 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''): @@ -29,7 +29,7 @@ index 5958382276..44264f0c81 100755 try: import plistlib diff --git a/configure b/configure -index beffc1fd76..c1a6fc4382 100755 +index 7e1e5e594ca..e11421617e6 100755 --- a/configure +++ b/configure @@ -4048,6 +4048,9 @@ then @@ -53,7 +53,7 @@ index beffc1fd76..c1a6fc4382 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index 5842bd24c4..e99df82739 100644 +index 58f54076ff2..1d51b1ac8e1 100644 --- a/configure.ac +++ b/configure.ac @@ -324,6 +324,9 @@ then diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index f6a82f1e..ea4ad267 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From ae26b5e3744016d2f3c7fad32500765d250ed364 Mon Sep 17 00:00:00 2001 +From 1d8b4e4a4be72fee133fc23b3f86ac39fca9c4ad Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/23] Fix TZPATH on windows @@ -8,7 +8,7 @@ Subject: [PATCH 10/23] Fix TZPATH on windows 1 file changed, 1 insertion(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 80aef34471..f31706d7a6 100644 +index 80aef344711..f31706d7a6b 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -479,6 +479,7 @@ def _init_config_vars(): diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index 18e53b2e..5d017bf9 100644 --- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,4 +1,4 @@ -From d0ce3c5e7c42270aa5c381e4cf629ddab5205dbc Mon Sep 17 00:00:00 2001 +From 39fdde0bc53252579ecdefdb1c1619367ffb1e60 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/23] Make dyld search work with SYSTEM_VERSION_COMPAT=1 @@ -15,7 +15,7 @@ as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index cbed2f32ca..f717b1f4d1 100644 +index cbed2f32caa..f717b1f4d18 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1489,7 +1489,7 @@ copy_com_pointer(PyObject *self, PyObject *args) diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 9fc64532..2c4afd00 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 2b63337924c78aac42780af33679349b0c1010c5 Mon Sep 17 00:00:00 2001 +From 5ce98799c4f819327adf53638097bc9e32a6d873 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/23] Unvendor bzip2 @@ -9,7 +9,7 @@ Subject: [PATCH 12/23] Unvendor bzip2 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 30ad0dc486..1d46cc8198 100644 +index 30ad0dc4864..1d46cc8198f 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -94,7 +94,7 @@ @@ -47,7 +47,7 @@ index 30ad0dc486..1d46cc8198 100644 diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters -index 7c0b516253..ed9510978f 100644 +index 7c0b5162537..ed9510978f1 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -21,33 +21,9 @@ diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index d0a0fc5e..2ad3ee69 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 4bdb6acf12607d04d1eb19c187fd4002d330859e Mon Sep 17 00:00:00 2001 +From 6c70a788ae4e143e733be3b4fb8c493c761335f6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/23] Unvendor libffi @@ -8,7 +8,7 @@ Subject: [PATCH 13/23] Unvendor libffi 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/PCbuild/libffi.props b/PCbuild/libffi.props -index 22c9550e2c..40ddb08d2b 100644 +index 22c9550e2c0..40ddb08d2b0 100644 --- a/PCbuild/libffi.props +++ b/PCbuild/libffi.props @@ -2,20 +2,11 @@ diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 93e8c155..f3ea0e78 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From d447498487ffbcb673fd46f2c399049164813b7e Mon Sep 17 00:00:00 2001 +From e7bf1351be8e6f09b21a74af9038e34423c14ed8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/23] Unvendor tcltk @@ -9,7 +9,7 @@ Subject: [PATCH 14/23] Unvendor tcltk 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 5ca877b5f2..4ee4ff6d61 100644 +index 5ca877b5f2e..4ee4ff6d619 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -126,12 +126,6 @@ @@ -26,7 +26,7 @@ index 5ca877b5f2..4ee4ff6d61 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 95b699b4ca..7aa8ef582c 100644 +index 95b699b4cac..7aa8ef582c7 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -12,12 +12,11 @@ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index d0e95d34..4b39e5b2 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 06c84376da44deeb053c8c31b7aaf02a3bfc7883 Mon Sep 17 00:00:00 2001 +From 4d05c339525594b1a0a13c945098b52a232404b8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/23] unvendor xz @@ -8,7 +8,7 @@ Subject: [PATCH 15/23] unvendor xz 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 321f41d8d2..bd7d6c64b1 100644 +index 321f41d8d27..bd7d6c64b10 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -93,15 +93,15 @@ diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index f1edd2fd..eb7f3067 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From b84d1d0dc0e2b74ed33953051a3140254be34a7d Mon Sep 17 00:00:00 2001 +From 57e21846907da306162035f2794f80784e5b7641 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/23] unvendor zlib @@ -9,7 +9,7 @@ Subject: [PATCH 16/23] unvendor zlib 2 files changed, 4 insertions(+), 95 deletions(-) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index b85cca2cd5..8e09d243c5 100644 +index b85cca2cd51..8e09d243c53 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -80,7 +80,7 @@ index b85cca2cd5..8e09d243c5 100644 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 3eed5a9465..0892b669d6 100644 +index 3eed5a9465b..0892b669d6b 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -852,39 +852,6 @@ diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index 19893e2a..b159911e 100644 --- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,4 +1,4 @@ -From a0010ee411fae6c4ac73f4cbd1ca497a912f2844 Mon Sep 17 00:00:00 2001 +From 898d5f0d69365f24b1acea3497f1c9c357d8f03a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/23] Do not pass -g to GCC when not Py_DEBUG @@ -10,7 +10,7 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index c1a6fc4382..1edd09e0cc 100755 +index e11421617e6..f59a447bc29 100755 --- a/configure +++ b/configure @@ -5667,9 +5667,9 @@ if test $ac_test_CFLAGS; then @@ -35,7 +35,7 @@ index c1a6fc4382..1edd09e0cc 100755 ;; *) diff --git a/configure.ac b/configure.ac -index e99df82739..2df5beb5c0 100644 +index 1d51b1ac8e1..4ea227c40a4 100644 --- a/configure.ac +++ b/configure.ac @@ -2361,7 +2361,7 @@ then diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index f270fd09..bdd11f4a 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From 8979b94cda12107faa89698d05d30c6519ac6bf4 Mon Sep 17 00:00:00 2001 +From d9012e34d2377c7af94c515c5b331377f12a25a3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/23] Unvendor expat @@ -11,7 +11,7 @@ Subject: [PATCH 18/23] Unvendor expat 4 files changed, 10 insertions(+), 104 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 94da21f642..f47bcd8e4e 100644 +index 94da21f6425..f47bcd8e4e6 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -93,36 +93,19 @@ @@ -56,7 +56,7 @@ index 94da21f642..f47bcd8e4e 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index bc14e31f32..7cc8e9a3b9 100644 +index bc14e31f32b..7cc8e9a3b9b 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -17,70 +17,14 @@ @@ -133,7 +133,7 @@ index bc14e31f32..7cc8e9a3b9 100644 \ No newline at end of file + diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 3bcef600a3..ec5d4b64b3 100644 +index 3bcef600a3e..ec5d4b64b3c 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -90,23 +90,19 @@ @@ -165,7 +165,7 @@ index 3bcef600a3..ec5d4b64b3 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index fd22fc8c47..41c73b434b 100644 +index fd22fc8c477..41c73b434b9 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -11,31 +11,14 @@ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 826b2b62..d5d8bee6 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 938bbf50591026c72ee403cbfb20c4cd8bbb836d Mon Sep 17 00:00:00 2001 +From a753f3235aa70f70b63c2cb725c8ead2d24091b6 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/23] Remove unused readelf @@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``. 1 file changed, 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6b40228bca..79102c6585 100644 +index f9932ddab9d..03ea3cadcff 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,7 +38,6 @@ CC= @CC@ diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch index 2ed4c88e..6be74af9 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From 38466ceef3e3d900c680d338489cc39ad0f7888d Mon Sep 17 00:00:00 2001 +From a52cd2d934f05d38bdd33b1b608868bb9c0e374d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/23] Don't checksharedmods if cross-compiling @@ -10,7 +10,7 @@ Subject: [PATCH 20/23] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index 79102c6585..ebacdb9d0f 100644 +index 03ea3cadcff..9d2ad1889e0 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1367,7 +1367,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt @@ -24,7 +24,7 @@ index 79102c6585..ebacdb9d0f 100644 rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/if_runnable.sh b/if_runnable.sh new file mode 100755 -index 0000000000..dcfde5b751 +index 00000000000..dcfde5b751e --- /dev/null +++ b/if_runnable.sh @@ -0,0 +1,10 @@ diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 1918f87a..29fd5919 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From aa476f87309f709b47c221bbaa6efe3b6009cff1 Mon Sep 17 00:00:00 2001 +From 3602cfe1f32e939c04fc13c02eda493b1e562455 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/23] Override configure LIBFFI @@ -8,7 +8,7 @@ Subject: [PATCH 21/23] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 1edd09e0cc..b837875dbf 100755 +index f59a447bc29..e2b8dac1d18 100755 --- a/configure +++ b/configure @@ -14269,7 +14269,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index 788f9c37..4f953a4b 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From f913216ab628d7519525bd047c6553aec72814cc Mon Sep 17 00:00:00 2001 +From 3dd786488c6f7d95ba38c09c128364980191f1b9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/23] Unvendor libmpdec @@ -8,7 +8,7 @@ Subject: [PATCH 22/23] Unvendor libmpdec 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index e9d60b4db1..0f49d7923f 100644 +index e9d60b4db1a..0f49d7923f5 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -93,65 +93,27 @@ diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index e4a42518..62abd27b 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From f92249ee257abc9024cddf8239f06cdc738a453f Mon Sep 17 00:00:00 2001 +From 3a8565ff0e1340b1f0e771c4c813e836beb9f5be Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/23] Brand conda-forge @@ -9,7 +9,7 @@ Subject: [PATCH 23/23] Brand conda-forge 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 44264f0c81..d9e2eb7f1c 100755 +index 44264f0c812..d9e2eb7f1cc 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1197,6 +1197,7 @@ def _sys_version(sys_version=None): @@ -21,7 +21,7 @@ index 44264f0c81..d9e2eb7f1c 100755 r'(?:,\s*([\w ]*)' # ", builddate" r'(?:,\s*([\w :]*))?)?\)\s*' # ", buildtime)" diff --git a/Python/getversion.c b/Python/getversion.c -index 226b2f999a..92e4459bda 100644 +index 226b2f999a6..92e4459bdac 100644 --- a/Python/getversion.c +++ b/Python/getversion.c @@ -15,9 +15,9 @@ void _Py_InitVersion(void)