diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml deleted file mode 100755 index b16fb80c3..000000000 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ /dev/null @@ -1,129 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: linux - pool: - vmImage: ubuntu-latest - strategy: - matrix: - linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_64_build_typedebugchannel_targetsc_h10d856d4 - linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_64_build_typedebugchannel_targetsc_hf83d9e2d - linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: - CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_64_build_typereleasechannel_target_h01f3c156 - linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: - CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_64_build_typereleasechannel_target_hf5ff4d16 - linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: - CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_aarch64_build_typedebugchannel_tar_hd2db0a21 - linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: - CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_aarch64_build_typedebugchannel_tar_h51de9693 - linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: - CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_aarch64_build_typereleasechannel_t_hccc48f4a - linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: - CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_aarch64_build_typereleasechannel_t_h78d2c7f5 - linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: - CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_ppc64le_build_typedebugchannel_tar_hac8bb296 - linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: - CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_ppc64le_build_typedebugchannel_tar_hb74ed675 - linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: - CONFIG: linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_ppc64le_build_typereleasechannel_t_h5454d1d5 - linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: - CONFIG: linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_ppc64le_build_typereleasechannel_t_hed84b2c3 - timeoutInMinutes: 360 - variables: {} - - steps: - # configure qemu binfmt-misc running. This allows us to run docker containers - # embedded qemu-static - - script: | - docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes - ls /proc/sys/fs/binfmt_misc/ - condition: not(startsWith(variables['CONFIG'], 'linux_64')) - displayName: Configure binfmt_misc - - - script: | - export CI=azure - export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) - export remote_url=$(Build.Repository.Uri) - export sha=$(Build.SourceVersion) - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - .scripts/run_docker_build.sh - displayName: Run docker build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=build_artifacts - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index af8a7021a..ab5a161f0 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,41 +5,49 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_build_typedebugchannel_targetscon_h5e478946 + VMIMAGE: macOS-15 osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_build_typedebugchannel_targetscon_h116d3356 + VMIMAGE: macOS-15 osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_build_typereleasechannel_targetsc_h425d4db0 + VMIMAGE: macOS-15 osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_build_typereleasechannel_targetsc_haa8f77b8 + VMIMAGE: macOS-15 osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_build_typedebugchannel_targets_h4a1f0d05 + VMIMAGE: macOS-15 osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes: CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_build_typedebugchannel_targets_h49dbe0c1 + VMIMAGE: macOS-15 osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno: CONFIG: osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_build_typereleasechannel_targe_h0d9a29af + VMIMAGE: macOS-15 osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes: CONFIG: osx_arm64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_build_typereleasechannel_targe_h92a1d5a6 + VMIMAGE: macOS-15 timeoutInMinutes: 360 variables: {} 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 0a7b93c90..248eb028d 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 @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: - '11.0' build_type: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: 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 8d2c02a6c..50d827e23 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 @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: - '11.0' build_type: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: 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 29fea61c3..826852550 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: - '11.0' build_type: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: 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 74c06c4e4..6ad1d306e 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: - '11.0' build_type: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge/label/python_rc,conda-forge channel_targets: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml new file mode 100644 index 000000000..f4645c5b6 --- /dev/null +++ b/.github/workflows/conda-build.yml @@ -0,0 +1,165 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +name: Build conda package +on: + push: + + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + +jobs: + build: + name: ${{ matrix.CONFIG }} + runs-on: ${{ matrix.runs_on }} + timeout-minutes: 360 + strategy: + fail-fast: false + max-parallel: 50 + matrix: + include: + - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + steps: + + - name: Checkout code + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + + - name: Build on Linux + id: build-linux + if: matrix.os == 'ubuntu' + env: + CONFIG: ${{ matrix.CONFIG }} + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }} + CI: github_actions + CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}" + BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} + FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} + STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} + shell: bash + run: | + if [[ "$(uname -m)" == "x86_64" ]]; then + echo "::group::Configure binfmt_misc" + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + fi + export flow_run_id="github_$GITHUB_RUN_ID" + export remote_url="https://github.com/$GITHUB_REPOSITORY" + export sha="$GITHUB_SHA" + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export GIT_BRANCH="$(basename $GITHUB_REF)" + if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + echo "::endgroup::" + ./.scripts/run_docker_build.sh + + - name: Build on macOS + id: build-macos + if: matrix.os == 'macos' + env: + CONFIG: ${{ matrix.CONFIG }} + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + CI: github_actions + BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} + FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} + STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} + shell: bash + run: | + export flow_run_id="github_$GITHUB_RUN_ID" + export remote_url="https://github.com/$GITHUB_REPOSITORY" + export sha="$GITHUB_SHA" + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export GIT_BRANCH="$(basename $GITHUB_REF)" + if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + ./.scripts/run_osx_build.sh + + - name: Build on windows + id: build-windows + if: matrix.os == 'windows' + shell: cmd + run: | + set "flow_run_id=github_%GITHUB_RUN_ID%" + set "remote_url=https://github.com/%GITHUB_REPOSITORY%" + set "sha=%GITHUB_SHA%" + call ".scripts\run_win_build.bat" + env: + # default value; make it explicit, as it needs to match with artefact + # generation below. Not configurable for now, can be revisited later + CONDA_BLD_DIR: C:\bld + MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge + PYTHONUNBUFFERED: 1 + CONFIG: ${{ matrix.CONFIG }} + CI: github_actions + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} + FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} + STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2525be188..853faaab0 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -20,6 +20,7 @@ export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export RATTLER_CACHE_DIR="${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache" cat >~/.condarc </dev/null && pwd )" PROVIDER_DIR="$(basename "$THISDIR")" @@ -27,7 +29,7 @@ if [[ "${sha:-}" == "" ]]; then popd fi -docker info +${DOCKER_EXECUTABLE} info # In order for the conda-build process in the container to write to the mounted # volumes, we need to run with the same id as the host machine, which is @@ -35,6 +37,7 @@ docker info export HOST_USER_ID=$(id -u) # Check if docker-machine is being used (normally on OSX) and get the uid from # the VM + if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) fi @@ -76,16 +79,34 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi -( endgroup "Configure Docker" ) 2> /dev/null +# Default volume suffix for Docker (preserve original behavior) +VOLUME_SUFFIX=",z" +# Podman-specific handling +if [ "${DOCKER_EXECUTABLE}" = "podman" ]; then + # Fix file permissions for rootless podman builds + podman unshare chown -R ${HOST_USER_ID}:${HOST_USER_ID} "${ARTIFACTS}" + podman unshare chown -R ${HOST_USER_ID}:${HOST_USER_ID} "${RECIPE_ROOT}" + + # Add SELinux label only if enforcing + if command -v getenforce &>/dev/null && [ "$(getenforce)" = "Enforcing" ]; then + VOLUME_SUFFIX=",z" + else + VOLUME_SUFFIX="" + fi +fi + +( endgroup "Configure Docker" ) 2> /dev/null ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" export IS_PR_BUILD="${IS_PR_BUILD:-False}" -docker pull "${DOCKER_IMAGE}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ + +${DOCKER_EXECUTABLE} pull "${DOCKER_IMAGE}" + +${DOCKER_EXECUTABLE} run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw${VOLUME_SUFFIX},delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw${VOLUME_SUFFIX},delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ diff --git a/LICENSE.txt b/LICENSE.txt index 2ec51d75f..c5aa738f1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,5 @@ BSD-3-Clause license -Copyright (c) 2015-2022, conda-forge contributors -All rights reserved. +Copyright (c) 2015-2026, conda-forge contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 78eed68b8..48d0ae387 100644 --- a/README.md +++ b/README.md @@ -235,14 +235,14 @@ Current release info Installing python ================= -Installing `python` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `python` from the `conda-forge/label/python_debug` channel can be achieved by adding `conda-forge/label/python_debug` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/python_debug conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `cpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: +Once the `conda-forge/label/python_debug` channel has been enabled, `cpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: ``` conda install cpython libpython-static python python-freethreading python-gil python-jit @@ -257,26 +257,26 @@ mamba install cpython libpython-static python python-freethreading python-gil py It is possible to list all of the versions of `cpython` available on your platform with `conda`: ``` -conda search cpython --channel conda-forge +conda search cpython --channel conda-forge/label/python_debug ``` or with `mamba`: ``` -mamba search cpython --channel conda-forge +mamba search cpython --channel conda-forge/label/python_debug ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search cpython --channel conda-forge +mamba repoquery search cpython --channel conda-forge/label/python_debug # List packages depending on `cpython`: -mamba repoquery whoneeds cpython --channel conda-forge +mamba repoquery whoneeds cpython --channel conda-forge/label/python_debug # List dependencies of `cpython`: -mamba repoquery depends cpython --channel conda-forge +mamba repoquery depends cpython --channel conda-forge/label/python_debug ``` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 438c19be3..03594e446 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,6 +28,5 @@ stages: condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) dependsOn: Check jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 9dfe44039..05493e4d8 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,6 @@ #!/bin/sh """exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on + # # This file has been generated by conda-smithy in order to build the recipe # locally. @@ -27,13 +28,6 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) - # The default cache location might not be writable using docker on macOS. - if ns.config.startswith("linux") and platform.system() == "Darwin": - os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( - os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") - + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" - ) - def run_docker_build(ns): script = ".scripts/run_docker_build.sh" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 227087372..494eee38b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.13.12" %} +{% set version = "3.13.13" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} @@ -46,7 +46,7 @@ package: source: - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - sha256: 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 + sha256: 2ab91ff401783ccca64f75d10c882e957bdfd60e2bf5a72f8421793729b78a71 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 1e73f7522..dbf4efd0d 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,7 +1,7 @@ -From e197022b6c7d45967a8a5b740b8fd7d21d059aed Mon Sep 17 00:00:00 2001 +From a70742c0b7ff8e15b948a74e112f1c5542cf8e57 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 01/24] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index 98afdd198..716b28575 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,7 +1,7 @@ -From fb978fc203b5318e3fce4361d3698b0feb939abc Mon Sep 17 00:00:00 2001 +From 3a4008e96246da906293908fbb4606040f959573 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 02/24] Win32: Do not download externals +Subject: [PATCH 02/25] Win32: Do not download externals --- PCbuild/build.bat | 4 ++-- 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 a72402962..93845015e 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,7 +1,8 @@ -From 24c5979ae5cf7febe41ad52060b248493735c517 Mon Sep 17 00:00:00 2001 +From 88bd8f9025833f84620ef05689285bf8f49d0092 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH] Fix find_library so that it looks in sys.prefix/lib first +Subject: [PATCH 03/25] Fix find_library so that it looks in sys.prefix/lib + first --- Lib/ctypes/macholib/dyld.py | 4 ++++ 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 c741d3351..ab74fe058 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,7 +1,7 @@ -From 4e3f13907040ce28ac000970380c56eb24437c84 Mon Sep 17 00:00:00 2001 +From 41a3e039bf637311f375d30d939d4486dc3aff0d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 04/24] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 04/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 Co-authored-by: Isuru Fernando diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index d02251dbd..0501ec79c 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,7 +1,7 @@ -From a5bc981e40a00c01ddd9c82015cc987358721c89 Mon Sep 17 00:00:00 2001 +From bffdcfa936322c7bf70469c2b7839b1b84b62785 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 05/24] Unvendor openssl +Subject: [PATCH 05/25] Unvendor openssl Co-authored-by: Isuru Fernando --- @@ -90,10 +90,10 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index 62f42d0ce9c..0ec0914facd 100644 +index c29caa61bbd..d0d58ce57e4 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props -@@ -61,6 +61,7 @@ +@@ -62,6 +62,7 @@ $(EXTERNALS_DIR) @@ -101,7 +101,7 @@ index 62f42d0ce9c..0ec0914facd 100644 $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ -@@ -68,18 +69,8 @@ +@@ -69,18 +70,8 @@ @@ -112,8 +112,8 @@ index 62f42d0ce9c..0ec0914facd 100644 - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include $(ExternalsDir)\mpdecimal-4.0.0\ -- $(ExternalsDir)openssl-3.0.18\ -- $(ExternalsDir)openssl-bin-3.0.18\$(ArchName)\ +- $(ExternalsDir)openssl-3.0.19\ +- $(ExternalsDir)openssl-bin-3.0.19\$(ArchName)\ - $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ - $(ExternalsDir)\zlib-1.3.1\ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 6971da1c4..45c33d67e 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From d29e0ce1655c9323a39b2d3dc23327f82b246429 Mon Sep 17 00:00:00 2001 +From 54ebce771e1cc5f36d69ca80277786f709ae41ce Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 -Subject: [PATCH 06/24] Unvendor sqlite3 +Subject: [PATCH 06/25] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 11 +++++------ diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index e59406f3a..949219c0d 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From e80541cbc8a42d8cc5d80fbb3dfcd6ec23fdfd8b Mon Sep 17 00:00:00 2001 +From 91619d973f19541cef025dc1ff192feed29fd1ce Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 07/24] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 07/25] Add CondaEcosystemModifyDllSearchPath() The python interpreter is modifed so that it works as if the python interpreter was called with the following conda directories. @@ -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 5e420bdf337..8f6b67c42b9 100644 +index 8ba9b2bd006..fb397de1ffb 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -74,6 +74,10 @@ diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 5d3c219fe..c3f050e8b 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,7 +1,7 @@ -From d1c349d5e8cade417eb4263cd30b4e5585b7a368 Mon Sep 17 00:00:00 2001 +From 87116ba01329804b3fdca98410416c075bd6c27e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 08/24] Doing d1trimfile +Subject: [PATCH 08/25] Doing d1trimfile --- PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 88510f087..41c380fd2 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,7 +1,7 @@ -From 4ca3a6e8016607bbb1a5d570f257e45364abc69a Mon Sep 17 00:00:00 2001 +From 1c3831e5afa7bf46f2525f8dd7ab08073b7d545e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 -Subject: [PATCH 09/24] cross compile darwin +Subject: [PATCH 09/25] cross compile darwin By Isuru Fernando. --- @@ -29,7 +29,7 @@ index 8895177e326..fd93841d034 100755 try: import plistlib diff --git a/configure b/configure -index 901a26c9602..e96a4d404e8 100755 +index 9ddb712b534..9e3d1d4929a 100755 --- a/configure +++ b/configure @@ -4052,6 +4052,9 @@ then @@ -53,7 +53,7 @@ index 901a26c9602..e96a4d404e8 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index 597a44b331a..2287ee877c8 100644 +index d9acfce793e..ca97817db17 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 121aebf91..c572cfb78 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,14 +1,14 @@ -From 3e6a9ea22336ec417dd43c896f9655fa1dc1b18e Mon Sep 17 00:00:00 2001 +From 598cafbb2d198448c9ccc5085d165bedaa2d1b79 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH 10/24] Fix TZPATH on windows +Subject: [PATCH 10/25] Fix TZPATH on windows --- Lib/sysconfig/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 510c7b9568a..c45f79fbc29 100644 +index 43edebce347..2df352ff415 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -499,6 +499,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 2796b5ce2..793fdf2e4 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,7 +1,7 @@ -From 9d74b2765ed81422abef76d0f9274d9879c8b81c Mon Sep 17 00:00:00 2001 +From 6d35fd22703f762a7b497b4ae3ac2702650a80c2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH 11/24] Make dyld search work with SYSTEM_VERSION_COMPAT=1 +Subject: [PATCH 11/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1 In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15` or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 6e25020a3..0b3dd37e0 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,7 +1,7 @@ -From d045ac342ba5e3556a834a7effce5fd616fd29e4 Mon Sep 17 00:00:00 2001 +From bdb7cb70431d64debe347a4112d85c165006aafb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 -Subject: [PATCH 12/24] Unvendor bzip2 +Subject: [PATCH 12/25] Unvendor bzip2 --- PCbuild/_bz2.vcxproj | 15 +++++---------- diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index c0abc24a4..c3e213036 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,7 +1,7 @@ -From 94b6bad05bb680053ebc68993ff576c6355c4070 Mon Sep 17 00:00:00 2001 +From b8a4cd2e7c9b4a46d6d6f61311116983ee8a6fc9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 -Subject: [PATCH 13/24] Unvendor libffi +Subject: [PATCH 13/25] Unvendor libffi --- PCbuild/libffi.props | 17 ++++------------- diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index cefbb5661..2ca007307 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,7 +1,7 @@ -From 2edf7ebf9ca5706be576c8f22c622834409a5559 Mon Sep 17 00:00:00 2001 +From 0ad0879eec0bd6349a479894db2758121dd3d2ab Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH 14/24] Unvendor tcltk +Subject: [PATCH 14/25] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 1412d9cf7..e10f61c84 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,7 +1,7 @@ -From 8a311a9adbd25026bf704ed89659727d2156465e Mon Sep 17 00:00:00 2001 +From 12182663cc91d74bc19715cfcf1b857c90654e59 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 -Subject: [PATCH 15/24] unvendor xz +Subject: [PATCH 15/25] unvendor xz --- PCbuild/_lzma.vcxproj | 10 +++------- diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 65a4aa982..006ee075a 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,7 +1,7 @@ -From e2ecbd37bf6cc41b3f772cf232e159178346ae4f Mon Sep 17 00:00:00 2001 +From 7aa5e5e91bfd9a52ea08e6737824299435fd59c2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 -Subject: [PATCH 16/24] unvendor zlib +Subject: [PATCH 16/25] unvendor zlib --- PCbuild/pythoncore.vcxproj | 33 ++------------- 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 d359566df..4f7c708c9 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,7 +1,7 @@ -From aead054ab122ac78a19d0fdcec8281b9591554f7 Mon Sep 17 00:00:00 2001 +From 717d9f0257864959e279715d9548bdb9f9245e58 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 17/24] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 17/25] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- @@ -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 e96a4d404e8..007a288bef9 100755 +index 9e3d1d4929a..50a25868016 100755 --- a/configure +++ b/configure @@ -5671,9 +5671,9 @@ if test $ac_test_CFLAGS; then @@ -25,7 +25,7 @@ index e96a4d404e8..007a288bef9 100755 fi else if test "$GCC" = yes; then -@@ -9522,7 +9522,7 @@ then +@@ -9559,7 +9559,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -35,10 +35,10 @@ index e96a4d404e8..007a288bef9 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 2287ee877c8..4297b33cfad 100644 +index ca97817db17..c88fcca1967 100644 --- a/configure.ac +++ b/configure.ac -@@ -2389,7 +2389,7 @@ then +@@ -2392,7 +2392,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 53944154f..f7f68c210 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,7 +1,7 @@ -From d8314955ea2fb0a086a38fd69f5886a4547e2593 Mon Sep 17 00:00:00 2001 +From 7b0d94fe8148aedb83dbdf911e37b1cd162dc6ab Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 -Subject: [PATCH 18/24] Unvendor expat +Subject: [PATCH 18/25] Unvendor expat --- PCbuild/_elementtree.vcxproj | 25 ++---------- diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index d9d414c14..17adbae73 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,7 +1,7 @@ -From b71ed0276f3394f3aeaa7d1c594533a81b302d9d Mon Sep 17 00:00:00 2001 +From 0c5ec96d061cc0769c7c577ec687604249198537 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 -Subject: [PATCH 19/24] Remove unused readelf +Subject: [PATCH 19/25] Remove unused readelf readelf has been dropped. .. date: 2022-11-02-10-56-40 @@ -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 a7dc9709d62..1cea3bcb829 100644 +index ecf77bdc41c..190eb5a1d1f 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 fb62f6848..5911d447b 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,7 +1,7 @@ -From 12c76d34c63b9db0d0c5352d353da44519516bae Mon Sep 17 00:00:00 2001 +From f94236352a144cc0815b630352b8586b7a08ebac Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 -Subject: [PATCH 20/24] Don't checksharedmods if cross-compiling +Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling --- Makefile.pre.in | 2 +- @@ -10,7 +10,7 @@ Subject: [PATCH 20/24] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index 1cea3bcb829..79ebf5e9806 100644 +index 190eb5a1d1f..8f170a02a80 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1372,7 +1372,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 92c98c258..a114ff5fc 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,17 +1,17 @@ -From 69dc8292f799bfb815a1a6c759f00651b90b6274 Mon Sep 17 00:00:00 2001 +From bdffd18d709e2fb55999928117e97399f6a49273 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 -Subject: [PATCH 21/24] Override configure LIBFFI +Subject: [PATCH 21/25] Override configure LIBFFI --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 007a288bef9..3d26aba9318 100755 +index 50a25868016..e5140a6b6c9 100755 --- a/configure +++ b/configure -@@ -14493,7 +14493,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -14530,7 +14530,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes then : have_libffi=yes diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index 6601b8bf5..0bc7dbd79 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,7 +1,7 @@ -From e5c7b0a2f1e9c50e676772826379b719bb973f40 Mon Sep 17 00:00:00 2001 +From 94f837c0c46e6e5c4454ea594955f431064c85e2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 -Subject: [PATCH 22/24] Unvendor libmpdec +Subject: [PATCH 22/25] Unvendor libmpdec --- PCbuild/_decimal.vcxproj | 50 +++++----------------------------------- diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 5217da769..4efdf0dda 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,7 +1,7 @@ -From 48db4749f96042bbda5fe1450e48ad305669d34f Mon Sep 17 00:00:00 2001 +From fbc76946acb1d2808eb8a17410dc546070d9fef0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 -Subject: [PATCH 23/24] Brand conda-forge +Subject: [PATCH 23/25] Brand conda-forge --- Lib/platform.py | 1 + diff --git a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch index e61a79a7d..3469df82a 100644 --- a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch +++ b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch @@ -1,7 +1,7 @@ -From 4bfe782c70be96684b25964887ae9507f0f17208 Mon Sep 17 00:00:00 2001 +From cf10296511485f2fba7912f0ad3e9b72a9da590f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 -Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the +Subject: [PATCH 24/25] Do not define pid_t as it might conflict with the actual definition --- @@ -29,7 +29,7 @@ index 769c3909ea3..242636c7cc4 100644 module _testcapi [clinic start generated code]*/ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c -index 97e046a4822..feb5c0b13f0 100644 +index 51baf1e8ef6..26f988b2fdd 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -23,6 +23,10 @@ @@ -59,7 +59,7 @@ index e2af09d0840..24715ac5182 100644 module _testlimitedcapi [clinic start generated code]*/ diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h -index 2aa771ab62b..ea1dd33504d 100644 +index dabce06705a..7718c09e829 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -10,6 +10,10 @@ preserve @@ -74,7 +74,7 @@ index 2aa771ab62b..ea1dd33504d 100644 "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n" "--\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index f31659808d7..2d5bf2d8995 100644 +index 78a8776c1ca..e48910a09bb 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -43,6 +43,7 @@ diff --git a/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch b/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch index a20c851e8..213e80dc3 100644 --- a/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch +++ b/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch @@ -1,14 +1,14 @@ -From 3a992e5ffbf40e7aaa451d2a39901a4028d367ab Mon Sep 17 00:00:00 2001 +From 58314111df23981c3dfe1c120c0acacb13a4d79f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 3 Sep 2025 13:32:24 +0200 -Subject: [PATCH] Search LLVM_ROOT for llvm binaries +Subject: [PATCH 25/25] Search LLVM_ROOT for llvm binaries --- Tools/jit/_llvm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tools/jit/_llvm.py b/Tools/jit/_llvm.py -index 606f280..95974f5 100644 +index 606f280a14d..95974f5f700 100644 --- a/Tools/jit/_llvm.py +++ b/Tools/jit/_llvm.py @@ -66,6 +66,11 @@ async def _get_brew_llvm_prefix(*, echo: bool = False) -> str | None: