diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml deleted file mode 100755 index 807de1f83..000000000 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ /dev/null @@ -1,52 +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_: - CONFIG: linux_64_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_: - CONFIG: linux_aarch64_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_ppc64le_: - CONFIG: linux_ppc64le_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - 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) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index bfe372746..0f510abf6 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -12,16 +12,26 @@ jobs: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 + SHORT_CONFIG: osx_64_ osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' - VMIMAGE: macOS-15 + VMIMAGE: macOS-15-arm64 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 + SHORT_CONFIG: osx_arm64_ timeoutInMinutes: 360 variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | + export MINIFORGE_HOME=$(tools_install_dir) + export CONDA_BLD_PATH=$(build_workspace_dir) export CI=azure export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) export remote_url=$(Build.Repository.Uri) @@ -40,3 +50,34 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + + - script: | + export MINIFORGE_HOME=$(tools_install_dir) + export CONDA_BLD_PATH=$(build_workspace_dir) + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_PATH except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_PATH 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: and(succeededOrFailed(), eq(variables.store_build_artifacts, true)) + + - 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-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ada976301..d364ba781 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,10 +11,12 @@ jobs: win_64_: CONFIG: win_64_ UPLOAD_PACKAGES: 'True' + build_workspace_dir: D:\\bld\\ + store_build_artifacts: true + tools_install_dir: D:\Miniforge + SHORT_CONFIG: win_64_ timeoutInMinutes: 360 variables: - CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: @@ -23,8 +25,8 @@ jobs: call ".scripts\run_win_build.bat" displayName: Run Windows build env: - MINIFORGE_HOME: $(MINIFORGE_HOME) - CONDA_BLD_PATH: $(CONDA_BLD_PATH) + MINIFORGE_HOME: $(tools_install_dir) + CONDA_BLD_PATH: $(build_workspace_dir) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure @@ -36,3 +38,32 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + + - script: | + set MINIFORGE_HOME=$(tools_install_dir) + set CONDA_BLD_PATH=$(build_workspace_dir) + set CI=azure + set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + set FEEDSTOCK_NAME=$(build.Repository.Name) + set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) + set BLD_ARTIFACT_PREFIX=conda_artifacts + if "%AGENT_JOBSTATUS%" == "Failed" ( + set ENV_ARTIFACT_PREFIX=conda_envs + ) + call ".scripts\create_conda_build_artifacts.bat" + displayName: Prepare conda build artifacts + condition: and(succeededOrFailed(), eq(variables.store_build_artifacts, true)) + + - 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/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 0270cecf8..1912c1bcb 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '14' docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 +- quay.io/condaforge/linux-anvil-aarch64:alma9 expat: - '2' liblzma_devel: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml new file mode 100644 index 000000000..93c3718f6 --- /dev/null +++ b/.github/workflows/conda-build.yml @@ -0,0 +1,217 @@ +# 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_ + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_64_ + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + tools_install_dir: ~/miniforge3 + build_workspace_dir: build_artifacts + docker_run_args: + - CONFIG: linux_aarch64_ + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_aarch64_ + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-24.04-arm'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 + tools_install_dir: ~/miniforge3 + build_workspace_dir: build_artifacts + docker_run_args: + - CONFIG: linux_ppc64le_ + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + tools_install_dir: ~/miniforge3 + build_workspace_dir: build_artifacts + docker_run_args: + steps: + + - name: Checkout code + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + + - name: Build on Linux + id: build-linux + if: matrix.os == 'ubuntu' + env: + MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} + CONFIG: ${{ matrix.CONFIG }} + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }} + CI: github_actions + CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.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 + export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" + export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" + echo "::endgroup::" + ./.scripts/run_docker_build.sh + + - name: Build on macOS + id: build-macos + if: matrix.os == 'macos' + env: + MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} + 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 + export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" + export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" + ./.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: + MINIFORGE_HOME: ${{ matrix.tools_install_dir }} + CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} + 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 }} + + - name: Determine build outcome + # this is to merge the status of the linux/osx/win builds into + # something we can easily reuse during artefact generation + id: determine-status + if: ${{ always() }} + shell: bash + env: + OS: ${{ matrix.os }} + run: | + if [[ "$OS" == "ubuntu" ]]; then + STATUS=${{ steps.build-linux.outcome }} + elif [[ "$OS" == "macos" ]]; then + STATUS=${{ steps.build-macos.outcome }} + elif [[ "$OS" == "windows" ]]; then + STATUS=${{ steps.build-windows.outcome }} + fi + if [ -z "$STATUS" ]; then + # steps that never ran will have empty status + STATUS="cancelled" + fi + echo "status=$STATUS" >> $GITHUB_OUTPUT + + - name: Prepare conda build artifacts + continue-on-error: true + id: prepare-artifacts + shell: bash + # we do not want to trigger artefact creation if the build was cancelled + if: ${{ always() && steps.determine-status.outputs.status != 'cancelled' && matrix.STORE_BUILD_ARTIFACTS }} + env: + CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} + CI: github_actions + CONFIG: ${{ matrix.CONFIG }} + SHORT_CONFIG: ${{ matrix.SHORT_CONFIG }} + JOB_STATUS: ${{ steps.determine-status.outputs.status }} + OS: ${{ matrix.os }} + run: | + export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" + export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" + export CI_RUN_ID=$GITHUB_RUN_ID + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export ARTIFACT_STAGING_DIR="$GITHUB_WORKSPACE" + # Archive everything in CONDA_BLD_PATH except environments + # Archive the CONDA_BLD_PATH environments only when the job fails + # Use different prefix for successful and failed build artifacts + # so random failures don't prevent rebuilds from creating artifacts. + if [ $JOB_STATUS == "failure" ]; then + export BLD_ARTIFACT_PREFIX="conda_artifacts" + export ENV_ARTIFACT_PREFIX="conda_envs" + else + export BLD_ARTIFACT_PREFIX="conda_pkgs" + fi + if [ $OS == "windows" ]; then + pwsh -Command ". '.scripts/create_conda_build_artifacts.bat'" + else + ./.scripts/create_conda_build_artifacts.sh + fi + + - name: Store conda build artifacts + uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + if: ${{ always() && steps.prepare-artifacts.outcome == 'success' }} + with: + name: ${{ steps.prepare-artifacts.outputs.BLD_ARTIFACT_NAME }} + path: ${{ steps.prepare-artifacts.outputs.BLD_ARTIFACT_PATH }} + retention-days: 14 + continue-on-error: true + + - name: Store conda build environment artifacts + uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 + # only relevant if build failed, see above + if: ${{ always() && steps.determine-status.outputs.status == 'failure' && steps.prepare-artifacts.outcome == 'success' }} + with: + name: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_NAME }} + path: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_PATH }} + retention-days: 14 + continue-on-error: true \ No newline at end of file diff --git a/.gitignore b/.gitignore index 47b5408a8..86a9c55b4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Ignore all files and folders in root * !/conda-forge.yml +!.recipe_maintainers.json # Don't ignore any files/folders if the parent folder is 'un-ignored' # This also avoids warnings when adding an already-checked file with an ignored parent. diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 780a358ff..c83e212f4 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 < /opt/conda/conda-meta/history micromamba install --root-prefix ~/.conda --prefix /opt/conda \ --yes --override-channels --channel conda-forge --strict-channel-priority \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 # set up the condarc diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat new file mode 100755 index 000000000..6120712cc --- /dev/null +++ b/.scripts/create_conda_build_artifacts.bat @@ -0,0 +1,77 @@ +setlocal enableextensions enabledelayedexpansion + +rem INPUTS (environment variables that need to be set before calling this script): +rem +rem CI (azure/github_actions/UNSET) +rem CI_RUN_ID (unique identifier for the CI job run) +rem FEEDSTOCK_NAME +rem CONFIG (build matrix configuration string) +rem SHORT_CONFIG (uniquely-shortened configuration string) +rem CONDA_BLD_PATH (path to the conda-bld directory) +rem ARTIFACT_STAGING_DIR (use working directory if unset) +rem BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) +rem ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) + +rem OUTPUTS +rem +rem BLD_ARTIFACT_NAME +rem BLD_ARTIFACT_PATH +rem ENV_ARTIFACT_NAME +rem ENV_ARTIFACT_PATH + +rem Check that the conda-build directory exists +if not exist %CONDA_BLD_PATH% ( + echo conda-build directory does not exist + exit 1 +) + +if not defined ARTIFACT_STAGING_DIR ( + rem Set staging dir to the working dir + set ARTIFACT_STAGING_DIR=%cd% +) + +rem Set a unique ID for the artifact(s), specialized for this particular job run +set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% +if not "%ARTIFACT_UNIQUE_ID%" == "%ARTIFACT_UNIQUE_ID:~0,80%" ( + set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%SHORT_CONFIG% +) + +rem Make the build artifact zip +if defined BLD_ARTIFACT_PREFIX ( + set BLD_ARTIFACT_NAME=%BLD_ARTIFACT_PREFIX%_%ARTIFACT_UNIQUE_ID% + echo BLD_ARTIFACT_NAME: !BLD_ARTIFACT_NAME! + + set "BLD_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%BLD_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" + 7z a "!BLD_ARTIFACT_PATH!" "%CONDA_BLD_PATH%" -xr^^!.git/ -xr^^!_*_env*/ -xr^^!*_cache/ -bb + if errorlevel 1 exit 1 + echo BLD_ARTIFACT_PATH: !BLD_ARTIFACT_PATH! + + if "%CI%" == "azure" ( + echo ##vso[task.setVariable variable=BLD_ARTIFACT_NAME]!BLD_ARTIFACT_NAME! + echo ##vso[task.setVariable variable=BLD_ARTIFACT_PATH]!BLD_ARTIFACT_PATH! + ) + if "%CI%" == "github_actions" ( + echo BLD_ARTIFACT_NAME=!BLD_ARTIFACT_NAME!>> !GITHUB_OUTPUT! + echo BLD_ARTIFACT_PATH=!BLD_ARTIFACT_PATH!>> !GITHUB_OUTPUT! + ) +) + +rem Make the environments artifact zip +if defined ENV_ARTIFACT_PREFIX ( + set ENV_ARTIFACT_NAME=!ENV_ARTIFACT_PREFIX!_%ARTIFACT_UNIQUE_ID% + echo ENV_ARTIFACT_NAME: !ENV_ARTIFACT_NAME! + + set "ENV_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%ENV_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" + 7z a "!ENV_ARTIFACT_PATH!" -r "%CONDA_BLD_PATH%"/_*_env*/ -bb + if errorlevel 1 exit 1 + echo ENV_ARTIFACT_PATH: !ENV_ARTIFACT_PATH! + + if "%CI%" == "azure" ( + echo ##vso[task.setVariable variable=ENV_ARTIFACT_NAME]!ENV_ARTIFACT_NAME! + echo ##vso[task.setVariable variable=ENV_ARTIFACT_PATH]!ENV_ARTIFACT_PATH! + ) + if "%CI%" == "github_actions" ( + echo ENV_ARTIFACT_NAME=!ENV_ARTIFACT_NAME!>> !GITHUB_OUTPUT! + echo ENV_ARTIFACT_PATH=!ENV_ARTIFACT_PATH!>> !GITHUB_OUTPUT! + ) +) diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh new file mode 100755 index 000000000..1e3acc78a --- /dev/null +++ b/.scripts/create_conda_build_artifacts.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash + +# INPUTS (environment variables that need to be set before calling this script): +# +# CI (azure/github_actions/UNSET) +# CI_RUN_ID (unique identifier for the CI job run) +# FEEDSTOCK_NAME +# CONFIG (build matrix configuration string) +# SHORT_CONFIG (uniquely-shortened configuration string) +# CONDA_BLD_PATH (path to the conda-bld directory) +# ARTIFACT_STAGING_DIR (use working directory if unset) +# BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) +# ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) + +# OUTPUTS +# +# BLD_ARTIFACT_NAME +# BLD_ARTIFACT_PATH +# ENV_ARTIFACT_NAME +# ENV_ARTIFACT_PATH + +source .scripts/logging_utils.sh + +# DON'T do set -x, because it results in double echo-ing pipeline commands +# and that might end up inserting extraneous quotation marks in output variables +set -e + +# Check that the conda-build directory exists +if [ ! -d "$CONDA_BLD_PATH" ]; then + echo "conda-build directory does not exist" + exit 1 +fi + +# Set staging dir to the working dir, in Windows style if applicable +if [[ -z "${ARTIFACT_STAGING_DIR}" ]]; then + if pwd -W; then + ARTIFACT_STAGING_DIR=$(pwd -W) + else + ARTIFACT_STAGING_DIR=$PWD + fi +fi +echo "ARTIFACT_STAGING_DIR: $ARTIFACT_STAGING_DIR" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + +# Set a unique ID for the artifact(s), specialized for this particular job run +ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" +if [[ ${#ARTIFACT_UNIQUE_ID} -gt 80 ]]; then + ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${SHORT_CONFIG}" +fi +echo "ARTIFACT_UNIQUE_ID: $ARTIFACT_UNIQUE_ID" + +# Set a descriptive ID for the archive(s), specialized for this particular job run +ARCHIVE_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" + +# Make the build artifact zip +if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then + export BLD_ARTIFACT_NAME="${BLD_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" + export BLD_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${BLD_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" + + ( startgroup "Archive conda build directory" ) 2> /dev/null + + # Try 7z and fall back to zip if it fails (for cross-platform use) + if ! 7z a "$BLD_ARTIFACT_PATH" "$CONDA_BLD_PATH" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then + pushd "$CONDA_BLD_PATH" + zip -r -y -T "$BLD_ARTIFACT_PATH" . -x '*.git/*' '*_*_env*/*' '*_cache/*' + popd + fi + + ( endgroup "Archive conda build directory" ) 2> /dev/null + + echo "BLD_ARTIFACT_NAME: $BLD_ARTIFACT_NAME" + echo "BLD_ARTIFACT_PATH: $BLD_ARTIFACT_PATH" + + if [[ "$CI" == "azure" ]]; then + echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" + echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" + elif [[ "$CI" == "github_actions" ]]; then + echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT + fi +fi + +# Make the environments artifact zip +if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then + export ENV_ARTIFACT_NAME="${ENV_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" + export ENV_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${ENV_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" + + ( startgroup "Archive conda build environments" ) 2> /dev/null + + # Try 7z and fall back to zip if it fails (for cross-platform use) + if ! 7z a "$ENV_ARTIFACT_PATH" -r "$CONDA_BLD_PATH"/'_*_env*/' -bb; then + pushd "$CONDA_BLD_PATH" + zip -r -y -T "$ENV_ARTIFACT_PATH" . -i '*_*_env*/*' + popd + fi + + ( endgroup "Archive conda build environments" ) 2> /dev/null + + echo "ENV_ARTIFACT_NAME: $ENV_ARTIFACT_NAME" + echo "ENV_ARTIFACT_PATH: $ENV_ARTIFACT_PATH" + + if [[ "$CI" == "azure" ]]; then + echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" + echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" + elif [[ "$CI" == "github_actions" ]]; then + echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT + fi +fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b63b5a05a..10d6a2af9 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -11,6 +11,8 @@ source .scripts/logging_utils.sh set -xeo pipefail +DOCKER_EXECUTABLE="${DOCKER_EXECUTABLE:-docker}" + THISDIR="$( cd "$( dirname "$0" )" >/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/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bac7141a9..b0eda55cd 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ chmod +x "${micromamba_exe}" echo "Creating environment" "${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ --channel conda-forge \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" echo "Cleaning up micromamba" @@ -73,7 +73,7 @@ if [[ "${OSX_SDK_DIR:-}" == "" ]]; then /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" fi else - if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + if tmpf=$(mktemp "$OSX_SDK_DIR"/tmp.XXXXXXXX 2>/dev/null); then rm -f "$tmpf" echo "OSX_SDK_DIR is writeable without sudo, continuing" else diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 27c552b1a..c07d98e61 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -31,7 +31,7 @@ if !errorlevel! neq 0 exit /b !errorlevel! echo Creating environment call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ --channel conda-forge ^ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% del /S /Q "%MAMBA_ROOT_PREFIX%" >nul diff --git a/README.md b/README.md index fa2aac585..2779a3a71 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,14 @@ Current build status ==================== - +
+ + + @@ -39,27 +46,6 @@ Current build status
GitHub Actions + + + +
Azure
- - - - - - - - -
VariantStatus
linux_64 - - variant - -
linux_aarch64 - - variant - -
linux_ppc64le - - variant - -
osx_64 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 825a4aff9..05493e4d8 100755 --- a/build-locally.py +++ b/build-locally.py @@ -28,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/conda-forge.yml b/conda-forge.yml index 342457df5..9b2309474 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,5 @@ build_platform: - linux_aarch64: linux_64 linux_ppc64le: linux_64 - osx_arm64: osx_64 conda_build: pkg_format: '2' conda_forge_output_validation: true @@ -10,5 +8,8 @@ github: tooling_branch_name: main provider: linux_aarch64: default - linux_ppc64le: native + osx_arm64: default test: native_and_emulated +workflow_settings: + store_build_artifacts: + - value: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 89d2b8516..fcc8be52b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 0 %} +{% set build_number = 1 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -83,6 +83,8 @@ source: - patches/0024-unvendor-zlib.patch - patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch - patches/0026-Unvendor-expat.patch + # backport https://github.com/python/cpython/pull/100373 + - patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch build: number: {{ build_number }} 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 19d7158c1..05afb9672 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 10f35347798231c4e0b56315eaaa2af0c0f49f4c Mon Sep 17 00:00:00 2001 +From d90bf48069c628f8b49d3b14ea50516232430056 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- @@ -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 3afcb0e2a0..1ee953a6ae 100644 +index 3afcb0e2a02..1ee953a6aea 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -33,7 +33,7 @@ diff --git a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch index 9cddef7f0..3c4ad95f3 100644 --- a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch +++ b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch @@ -1,7 +1,7 @@ -From 0329fff43db65c2ace0ed0492ae295dc9a49178d Mon Sep 17 00:00:00 2001 +From 8bd1fc261aa011920bf689212738fd8b96bcbd03 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:59:00 +0100 -Subject: [PATCH 02/25] Win32: distutils: Add support to cygwinccompiler for +Subject: [PATCH 02/27] Win32: distutils: Add support to cygwinccompiler for VS>=2015 Really this is for mingw-w64 though @@ -10,7 +10,7 @@ Really this is for mingw-w64 though 1 file changed, 3 insertions(+) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 66c12dd358..e6c790118b 100644 +index 66c12dd3583..e6c790118bb 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -80,6 +80,9 @@ def get_msvcr(): diff --git a/recipe/patches/0003-Support-cross-compiling-byte-code.patch b/recipe/patches/0003-Support-cross-compiling-byte-code.patch index 28ea9982c..91c2271a4 100644 --- a/recipe/patches/0003-Support-cross-compiling-byte-code.patch +++ b/recipe/patches/0003-Support-cross-compiling-byte-code.patch @@ -1,7 +1,7 @@ -From 7f2937f590d274969c748782dbb47c4ad1e4a3f6 Mon Sep 17 00:00:00 2001 +From b99a8df226dcc6f83322971b2e65316b9235934c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:17:33 +0100 -Subject: [PATCH 03/25] Support cross-compiling byte-code +Subject: [PATCH 03/27] Support cross-compiling byte-code https://bugs.python.org/issue22724 --- @@ -11,7 +11,7 @@ https://bugs.python.org/issue22724 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index fa99dd86c4..eada53ed36 100644 +index fa99dd86c41..eada53ed360 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -261,6 +261,7 @@ BUILDPYTHON= python$(BUILDEXE) @@ -77,7 +77,7 @@ index fa99dd86c4..eada53ed36 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure b/configure -index 4b71c4e00f..03a361cbd9 100755 +index 4b71c4e00f8..03a361cbd90 100755 --- a/configure +++ b/configure @@ -760,6 +760,7 @@ CONFIG_ARGS @@ -99,7 +99,7 @@ index 4b71c4e00f..03a361cbd9 100755 elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 diff --git a/configure.ac b/configure.ac -index ac3be3850a..08d81c26c6 100644 +index ac3be3850a9..08d81c26c6e 100644 --- a/configure.ac +++ b/configure.ac @@ -82,13 +82,15 @@ if test "$cross_compiling" = yes; then diff --git a/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch b/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch index 0858ab387..f63a320f4 100644 --- a/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch +++ b/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch @@ -1,7 +1,7 @@ -From 36fbaeb7f7a6673066c468426efa5d5a8bc71aa5 Mon Sep 17 00:00:00 2001 +From 2531597720a73cca27a1871a1d654d9dced1c218 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 21 Sep 2021 13:05:20 -0500 -Subject: [PATCH 04/25] bpo-45258: search for -isysroot in addition to +Subject: [PATCH 04/27] bpo-45258: search for -isysroot in addition to --sysroot -isysroot is for macOS, while --sysroot is for gcc/linux @@ -10,7 +10,7 @@ Subject: [PATCH 04/25] bpo-45258: search for -isysroot in addition to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a39610a1c7..b2d68de7cd 100644 +index a39610a1c7c..b2d68de7cd1 100644 --- a/setup.py +++ b/setup.py @@ -163,7 +163,7 @@ def sysroot_paths(make_vars, subdirs): diff --git a/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch index da42716fe..b6c758350 100644 --- a/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch +++ b/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch @@ -1,7 +1,7 @@ -From e8431940cfef761b7c6b31c0f927df342263cef8 Mon Sep 17 00:00:00 2001 +From 0a1f271aea29d6c0691860643f3383d8f3bc5118 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 5 Oct 2017 02:00:41 +0100 -Subject: [PATCH 05/25] runtime_library_dir_option: Use 1st word of CC as +Subject: [PATCH 05/27] runtime_library_dir_option: Use 1st word of CC as compiler Previous, 'CC' got passed to os.path.basename, so any paths in it after @@ -12,7 +12,7 @@ not get detected as gcc (or whatever it actually is). 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index d00c48981e..54dd556fe5 100644 +index d00c48981eb..54dd556fe5a 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -232,7 +232,8 @@ def runtime_library_dir_option(self, dir): diff --git a/recipe/patches/0006-Win32-Do-not-download-externals.patch b/recipe/patches/0006-Win32-Do-not-download-externals.patch index 5dcdbd305..460356008 100644 --- a/recipe/patches/0006-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0006-Win32-Do-not-download-externals.patch @@ -1,14 +1,14 @@ -From f2bcc66170d982e671dfd28ad88caf923b68c3f2 Mon Sep 17 00:00:00 2001 +From 678488a772e807546a4763ac17010f5bb7288029 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 06/25] Win32: Do not download externals +Subject: [PATCH 06/27] Win32: Do not download externals --- PCbuild/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index d333ceabd2..11e3d16a4f 100644 +index d333ceabd2e..11e3d16a4fd 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -97,7 +97,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true diff --git a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 679bfe88f..9fa2d4796 100644 --- a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,7 +1,8 @@ -From f2994809a2069bc051ec531c3189512142a4aa61 Mon Sep 17 00:00:00 2001 +From 5ab8259dcb27d5c38fe2ccec3f2b090eed44e647 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 07/27] Fix find_library so that it looks in sys.prefix/lib + first --- Lib/ctypes/macholib/dyld.py | 4 ++++ diff --git a/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch b/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch index f6b327224..bf695d26f 100644 --- a/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch +++ b/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch @@ -1,7 +1,7 @@ -From 49726f1962c2ad78932ac40621e35d1428f46d37 Mon Sep 17 00:00:00 2001 +From 9b4fb93be060983edfca1bbffc404e699f807dd4 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 16 Sep 2021 15:46:09 -0500 -Subject: [PATCH 08/25] bpo-22699: Allow compiling on debian/ubuntu with a +Subject: [PATCH 08/27] bpo-22699: Allow compiling on debian/ubuntu with a different compiler This PR fixes one issue mentioned in the bpo @@ -12,7 +12,7 @@ patch than given 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index b2d68de7cd..ddaa6d743c 100644 +index b2d68de7cd1..ddaa6d743cd 100644 --- a/setup.py +++ b/setup.py @@ -666,9 +666,30 @@ def check_extension_import(self, ext): diff --git a/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index 4b0fa1e5b..f7b904656 100644 --- a/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,7 +1,7 @@ -From c4a41cf22604fb8bb66f195aa7780d843418344a Mon Sep 17 00:00:00 2001 +From 138a7f1c63f9dbdb98da5011d99f1d1131059b5f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 09/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 09/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 --- @@ -9,7 +9,7 @@ Subject: [PATCH 09/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/PC/getpathp.c b/PC/getpathp.c -index 7c0eeab5db..a73ea8a0e9 100644 +index 7c0eeab5dba..a73ea8a0e91 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -778,13 +778,18 @@ calculate_module_search_path(PyCalculatePath *calculate, diff --git a/recipe/patches/0010-Unvendor-openssl.patch b/recipe/patches/0010-Unvendor-openssl.patch index d970bbe54..4523aa77c 100644 --- a/recipe/patches/0010-Unvendor-openssl.patch +++ b/recipe/patches/0010-Unvendor-openssl.patch @@ -1,7 +1,7 @@ -From 91e037ed322b7ce83ad7fd60fef6bbe0d76587c0 Mon Sep 17 00:00:00 2001 +From 7c32bbf7a8e35efcfc6fccac3be3b88ad9d6d0cb Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 10/25] Unvendor openssl +Subject: [PATCH 10/27] Unvendor openssl Co-authored-by: Isuru Fernando --- @@ -15,7 +15,7 @@ Co-authored-by: Isuru Fernando 7 files changed, 9 insertions(+), 70 deletions(-) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index 4907f49b66..b2c23d5e8c 100644 +index 4907f49b662..b2c23d5e8cc 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -99,9 +99,6 @@ @@ -29,7 +29,7 @@ index 4907f49b66..b2c23d5e8c 100644 diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters -index 716a69a41a..8aef9e03fc 100644 +index 716a69a41af..8aef9e03fcc 100644 --- a/PCbuild/_ssl.vcxproj.filters +++ b/PCbuild/_ssl.vcxproj.filters @@ -12,9 +12,6 @@ @@ -43,7 +43,7 @@ index 716a69a41a..8aef9e03fc 100644 diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index a7e16793c7..f7e9be4d11 100644 +index a7e16793c7f..f7e9be4d110 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -2,10 +2,10 @@ @@ -72,7 +72,7 @@ index a7e16793c7..f7e9be4d11 100644 \ No newline at end of file diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 0da6f67495..17eee400eb 100644 +index 0da6f674958..17eee400ebb 100644 --- a/PCbuild/openssl.vcxproj +++ b/PCbuild/openssl.vcxproj @@ -60,64 +60,8 @@ @@ -141,7 +141,7 @@ index 0da6f67495..17eee400eb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index 057ed5ac22..b7f958193c 100644 +index 057ed5ac224..b7f958193cb 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -57,6 +57,7 @@ @@ -153,7 +153,7 @@ index 057ed5ac22..b7f958193c 100644 $(ExternalsDir)\ diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 0adce0958b..38bab08306 100644 +index 0adce0958b1..38bab083060 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -106,6 +106,9 @@ @@ -167,7 +167,7 @@ index 0adce0958b..38bab08306 100644 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index e23635e5ea..525295c76f 100644 +index e23635e5ea9..525295c76ff 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -98,6 +98,9 @@ diff --git a/recipe/patches/0011-Unvendor-sqlite3.patch b/recipe/patches/0011-Unvendor-sqlite3.patch index 9beffc9f9..b1dd9680d 100644 --- a/recipe/patches/0011-Unvendor-sqlite3.patch +++ b/recipe/patches/0011-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From 11130223b608ff02ed637041e46a8d1a05faf21d Mon Sep 17 00:00:00 2001 +From 464469d29ed8a1edf449254dc7b67cc525342f96 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 -Subject: [PATCH 11/25] Unvendor sqlite3 +Subject: [PATCH 11/27] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 9 ++++----- @@ -11,7 +11,7 @@ Subject: [PATCH 11/25] Unvendor sqlite3 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 5eb8559d29..fcdee1be60 100644 +index 5eb8559d292..fcdee1be600 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -93,8 +93,11 @@ @@ -39,7 +39,7 @@ index 5eb8559d29..fcdee1be60 100644 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index 3507b97279..2b4ac3258c 100644 +index 3507b972797..2b4ac3258c0 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -55,8 +55,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj" @@ -52,7 +52,7 @@ index 3507b97279..2b4ac3258c 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" diff --git a/PCbuild/python.props b/PCbuild/python.props -index b7f958193c..fe3fd7bad2 100644 +index b7f958193cb..fe3fd7bad2a 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@ index b7f958193c..fe3fd7bad2 100644 $(ExternalsDir)xz-5.2.5\ $(ExternalsDir)libffi-3.3.0\ diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index e39e2d9c22..63d1c27fbc 100644 +index e39e2d9c226..63d1c27fbc7 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -88,12 +88,12 @@ diff --git a/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch b/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch index 139765e8d..6f94e2014 100644 --- a/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch +++ b/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch @@ -1,14 +1,14 @@ -From 5ae268703ce08a0fda90ce44c6e502cdd3279c35 Mon Sep 17 00:00:00 2001 +From c4cb6f93d3fa86d89fa2f07a4d8c855f63d9aef7 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 3 Nov 2019 15:09:45 -0600 -Subject: [PATCH 12/25] Use ranlib from env if env variable is set +Subject: [PATCH 12/27] Use ranlib from env if env variable is set --- Lib/distutils/sysconfig.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 3414a761e7..181f66708e 100644 +index 3414a761e76..181f66708e9 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -263,6 +263,9 @@ def customize_compiler(compiler): diff --git a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch index eea99a90c..638f86b19 100644 --- a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From 86f3a2a310efbb6d9825e7c4c8339ae8e1df2787 Mon Sep 17 00:00:00 2001 +From a2480fc4455eaf5a143e662d57981e5c323723bb Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 13/25] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 13/27] Add CondaEcosystemModifyDllSearchPath() There are 2 modes depending on CONDA_DLL_SEARCH_MODIFICATION env variable @@ -61,7 +61,7 @@ Co-authored-by: Isuru Fernando 3 files changed, 378 insertions(+), 1 deletion(-) diff --git a/Modules/main.c b/Modules/main.c -index 2684d23067..d04a4962b7 100644 +index 48d9247c132..697a13cc751 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -17,6 +17,10 @@ @@ -75,7 +75,7 @@ index 2684d23067..d04a4962b7 100644 #endif /* End of includes for exit_sigint() */ -@@ -680,10 +684,376 @@ Py_RunMain(void) +@@ -684,10 +688,376 @@ Py_RunMain(void) return exitcode; } @@ -453,7 +453,7 @@ index 2684d23067..d04a4962b7 100644 if (_PyStatus_IS_EXIT(status)) { pymain_free(); diff --git a/Python/dynload_win.c b/Python/dynload_win.c -index 96faa4b462..06dedc4af6 100644 +index 96faa4b4629..06dedc4af67 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -191,6 +191,10 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, @@ -468,7 +468,7 @@ index 96faa4b462..06dedc4af6 100644 hDLL = LoadLibraryExW(wpathname, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index b0c5da56c4..4194847957 100644 +index b0c5da56c4f..41948479574 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -101,7 +101,10 @@ _PyRuntime_Initialize(void) diff --git a/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch b/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch index 9450d8004..da4ef7dfc 100644 --- a/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch +++ b/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch @@ -1,14 +1,14 @@ -From 8bab6d46315cc02d2293b44308ff2b178c78f61f Mon Sep 17 00:00:00 2001 +From d41109addfba685eeb4c16a733987b8932d77f15 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 20:46:36 +0100 -Subject: [PATCH 14/25] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable +Subject: [PATCH 14/27] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable --- Lib/distutils/_msvccompiler.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py -index af8099a407..0b245adb30 100644 +index af8099a4078..0b245adb309 100644 --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -346,6 +346,13 @@ def compile(self, sources, diff --git a/recipe/patches/0015-Doing-d1trimfile.patch b/recipe/patches/0015-Doing-d1trimfile.patch index 8b31956c0..d7fe8b050 100644 --- a/recipe/patches/0015-Doing-d1trimfile.patch +++ b/recipe/patches/0015-Doing-d1trimfile.patch @@ -1,7 +1,7 @@ -From b5cd52035a412eb58d573f70aedf0867d40030f6 Mon Sep 17 00:00:00 2001 +From 89a0be2ad0fa43c8e6330f9bc8ac42f4336fb9a1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 15/25] Doing d1trimfile +Subject: [PATCH 15/27] Doing d1trimfile --- PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++ @@ -49,7 +49,7 @@ Subject: [PATCH 15/25] Doing d1trimfile 42 files changed, 363 insertions(+), 3 deletions(-) diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj -index ed1e1bc0a4..47d322be5f 100644 +index ed1e1bc0a42..47d322be5fd 100644 --- a/PCbuild/_asyncio.vcxproj +++ b/PCbuild/_asyncio.vcxproj @@ -91,6 +91,26 @@ @@ -80,7 +80,7 @@ index ed1e1bc0a4..47d322be5f 100644 diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 3fe95fbf83..0402f7a9aa 100644 +index 3fe95fbf839..0402f7a9aaa 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -97,6 +97,10 @@ @@ -95,7 +95,7 @@ index 3fe95fbf83..0402f7a9aa 100644 diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj -index 69e4271a9b..f28002d190 100644 +index 69e4271a9bd..f28002d190a 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -95,6 +95,10 @@ @@ -110,7 +110,7 @@ index 69e4271a9b..f28002d190 100644 /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj -index 8a01e743a4..1ad658d5f9 100644 +index 8a01e743a4d..1ad658d5f91 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -92,6 +92,26 @@ @@ -141,7 +141,7 @@ index 8a01e743a4..1ad658d5f9 100644 diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index 0916f1a2d3..17a4cbfcd7 100644 +index 0916f1a2d37..17a4cbfcd7c 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -99,6 +99,10 @@ @@ -156,7 +156,7 @@ index 0916f1a2d3..17a4cbfcd7 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 4a125b243b..20cc09d63f 100644 +index 4a125b243b7..20cc09d63ff 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -95,6 +95,10 @@ @@ -171,7 +171,7 @@ index 4a125b243b..20cc09d63f 100644 diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_importlib.vcxproj -index e437412a16..c4d5886b9f 100644 +index e437412a161..c4d5886b9f4 100644 --- a/PCbuild/_freeze_importlib.vcxproj +++ b/PCbuild/_freeze_importlib.vcxproj @@ -89,6 +89,10 @@ @@ -186,7 +186,7 @@ index e437412a16..c4d5886b9f 100644 Console diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj -index 6dad8183c5..6d3d37fdf9 100644 +index 6dad8183c57..6d3d37fdf95 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -96,6 +96,18 @@ @@ -209,7 +209,7 @@ index 6dad8183c5..6d3d37fdf9 100644 diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index fe076a6fc5..0565132363 100644 +index fe076a6fc57..0565132363e 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -95,6 +95,10 @@ @@ -224,7 +224,7 @@ index fe076a6fc5..0565132363 100644 $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj -index 720eb2931b..247ab0e915 100644 +index 720eb2931be..247ab0e9155 100644 --- a/PCbuild/_msi.vcxproj +++ b/PCbuild/_msi.vcxproj @@ -96,6 +96,18 @@ @@ -247,7 +247,7 @@ index 720eb2931b..247ab0e915 100644 diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj -index 77b6bfc8e1..3c2b651549 100644 +index 77b6bfc8e1e..3c2b6515496 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -95,6 +95,18 @@ @@ -270,7 +270,7 @@ index 77b6bfc8e1..3c2b651549 100644 diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj -index 9e60d3b5db..95b57290f8 100644 +index 9e60d3b5db3..95b57290f83 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -95,6 +95,18 @@ @@ -293,7 +293,7 @@ index 9e60d3b5db..95b57290f8 100644 diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj -index 8065b23585..e46ab5a83b 100644 +index 8065b235851..e46ab5a83b2 100644 --- a/PCbuild/_queue.vcxproj +++ b/PCbuild/_queue.vcxproj @@ -91,6 +91,26 @@ @@ -324,7 +324,7 @@ index 8065b23585..e46ab5a83b 100644 diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj -index 8fd75f90e7..b403828291 100644 +index 8fd75f90e7e..b403828291c 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -95,6 +95,18 @@ @@ -347,7 +347,7 @@ index 8fd75f90e7..b403828291 100644 diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index fcdee1be60..ec2680955f 100644 +index fcdee1be600..ec2680955fb 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -94,6 +94,10 @@ @@ -362,7 +362,7 @@ index fcdee1be60..ec2680955f 100644 $(sqlite3Dir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index b2c23d5e8c..ebe4e88848 100644 +index b2c23d5e8cc..ebe4e888487 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -385,7 +385,7 @@ index b2c23d5e8c..ebe4e88848 100644 diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj -index 917d7ae50f..8c7e141eea 100644 +index 917d7ae50fe..8c7e141eeaa 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -92,6 +92,26 @@ @@ -416,7 +416,7 @@ index 917d7ae50f..8c7e141eea 100644 diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index c1a1943725..99ee2f4a41 100644 +index c1a19437253..99ee2f4a414 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ @@ -447,7 +447,7 @@ index c1a1943725..99ee2f4a41 100644 diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj -index 5d7e14eff1..695dcb3b91 100644 +index 5d7e14eff10..695dcb3b917 100644 --- a/PCbuild/_testconsole.vcxproj +++ b/PCbuild/_testconsole.vcxproj @@ -92,6 +92,10 @@ @@ -462,7 +462,7 @@ index 5d7e14eff1..695dcb3b91 100644 Console diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj -index a7ea8787e0..eab72171e3 100644 +index a7ea8787e0c..eab72171e3b 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -89,6 +89,10 @@ @@ -477,7 +477,7 @@ index a7ea8787e0..eab72171e3 100644 Console diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj -index 6d80d5779f..951bf40e7c 100644 +index 6d80d5779f2..951bf40e7cd 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -92,6 +92,26 @@ @@ -508,7 +508,7 @@ index 6d80d5779f..951bf40e7c 100644 diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj -index 6c5b12cd40..d25c774913 100644 +index 6c5b12cd40e..d25c7749138 100644 --- a/PCbuild/_testinternalcapi.vcxproj +++ b/PCbuild/_testinternalcapi.vcxproj @@ -92,6 +92,26 @@ @@ -539,7 +539,7 @@ index 6c5b12cd40..d25c774913 100644 diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj -index 430eb528cc..7a268d227b 100644 +index 430eb528cc3..7a268d227bc 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -92,6 +92,10 @@ @@ -554,7 +554,7 @@ index 430eb528cc..7a268d227b 100644 Console diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index af813b77c1..9ff2acde0a 100644 +index af813b77c1d..9ff2acde0ab 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -96,6 +96,10 @@ @@ -569,7 +569,7 @@ index af813b77c1..9ff2acde0a 100644 $(tcltkLib);%(AdditionalDependencies) 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 @@ @@ -584,7 +584,7 @@ index 4dd42ab98a..7c2dbc7e70 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index b2d9f5d57d..26ac82980c 100644 +index b2d9f5d57d4..26ac82980ca 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -599,7 +599,7 @@ index b2d9f5d57d..26ac82980c 100644 diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj -index 550e084230..0ea871bddb 100644 +index 550e0842300..0ea871bddb1 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -93,6 +93,10 @@ @@ -614,7 +614,7 @@ index 550e084230..0ea871bddb 100644 version.lib;%(AdditionalDependencies) diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj -index ea432d6bc9..13bc692103 100644 +index ea432d6bc9a..13bc6921030 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -92,6 +92,10 @@ @@ -629,7 +629,7 @@ index ea432d6bc9..13bc692103 100644 version.lib;shlwapi.lib;%(AdditionalDependencies) diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 38bab08306..8cedf9f9e8 100644 +index 38bab083060..8cedf9f9e86 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -91,6 +91,10 @@ @@ -644,7 +644,7 @@ index 38bab08306..8cedf9f9e8 100644 Console diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj -index ec22e6fc76..80dff0a3d9 100644 +index ec22e6fc76e..80dff0a3d97 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -93,6 +93,10 @@ @@ -659,7 +659,7 @@ index ec22e6fc76..80dff0a3d9 100644 true 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 @@ @@ -672,7 +672,7 @@ index fb27e9e712..f8dc841ef1 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index fe8b2c90ed..215ebfdbf4 100644 +index fe8b2c90ed0..215ebfdbf4d 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ @@ -685,7 +685,7 @@ index fe8b2c90ed..215ebfdbf4 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 525295c76f..bb4972618a 100644 +index 525295c76ff..bb4972618af 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -92,6 +92,18 @@ @@ -708,7 +708,7 @@ index 525295c76f..bb4972618a 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 @@ @@ -721,7 +721,7 @@ index e21e46a1b7..ff7dc6635d 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj -index 44e3fc2927..1105c99807 100644 +index 44e3fc29272..1105c998072 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -736,7 +736,7 @@ index 44e3fc2927..1105c99807 100644 version.lib;%(AdditionalDependencies) diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj -index 750a713949..1da66eaddc 100644 +index 750a7139499..1da66eaddcb 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -94,6 +94,18 @@ @@ -759,7 +759,7 @@ index 750a713949..1da66eaddc 100644 diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj -index addef75335..1a13f363e2 100644 +index addef753359..1a13f363e26 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -91,6 +91,26 @@ @@ -790,7 +790,7 @@ index addef75335..1a13f363e2 100644 diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj -index 123e84ec4e..6272f9f69d 100644 +index 123e84ec4e3..6272f9f69db 100644 --- a/PCbuild/venvlauncher.vcxproj +++ b/PCbuild/venvlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -805,7 +805,7 @@ index 123e84ec4e..6272f9f69d 100644 PY_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index b8504d5d08..60d6308713 100644 +index b8504d5d08e..60d63087134 100644 --- a/PCbuild/venvwlauncher.vcxproj +++ b/PCbuild/venvwlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -820,7 +820,7 @@ index b8504d5d08..60d6308713 100644 PYW_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj -index 32cedc9b44..c9abee1d69 100644 +index 32cedc9b444..c9abee1d691 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -96,6 +96,18 @@ @@ -843,7 +843,7 @@ index 32cedc9b44..c9abee1d69 100644 diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj -index 1c776fb0da..36dec23c20 100644 +index 1c776fb0da3..36dec23c203 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -93,6 +93,12 @@ @@ -860,7 +860,7 @@ index 1c776fb0da..36dec23c20 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj -index dd830b3b6a..fef2c5b9f4 100644 +index dd830b3b6aa..fef2c5b9f47 100644 --- a/PCbuild/xxlimited_35.vcxproj +++ b/PCbuild/xxlimited_35.vcxproj @@ -93,6 +93,12 @@ diff --git a/recipe/patches/0016-cross-compile-darwin.patch b/recipe/patches/0016-cross-compile-darwin.patch index 32d039c84..00c93ebea 100644 --- a/recipe/patches/0016-cross-compile-darwin.patch +++ b/recipe/patches/0016-cross-compile-darwin.patch @@ -1,7 +1,7 @@ -From 6a70dba3153d5fd4012dcd1a8364df5b1576ae93 Mon Sep 17 00:00:00 2001 +From 28fe86f8a9abad9fa08616fd249e5a24b8bb8d71 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 -Subject: [PATCH 16/25] cross compile darwin +Subject: [PATCH 16/27] cross compile darwin By Isuru Fernando. --- @@ -12,7 +12,7 @@ By Isuru Fernando. 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 6a820c90a1..0238aeb365 100755 +index 6a820c90a1a..0238aeb3650 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -411,7 +411,12 @@ def win32_ver(release='', version='', csd='', ptype=''): @@ -30,7 +30,7 @@ index 6a820c90a1..0238aeb365 100755 try: import plistlib diff --git a/configure b/configure -index 03a361cbd9..0427ae321c 100755 +index 03a361cbd90..0427ae321cc 100755 --- a/configure +++ b/configure @@ -3393,6 +3393,9 @@ if test "$cross_compiling" = yes; then @@ -53,7 +53,7 @@ index 03a361cbd9..0427ae321c 100755 readelf|:) as_fn_error $? "readelf for the host is required for cross builds" "$LINENO" 5 diff --git a/configure.ac b/configure.ac -index 08d81c26c6..b23727c5fc 100644 +index 08d81c26c6e..b23727c5fc7 100644 --- a/configure.ac +++ b/configure.ac @@ -448,6 +448,9 @@ if test "$cross_compiling" = yes; then @@ -76,7 +76,7 @@ index 08d81c26c6..b23727c5fc 100644 readelf|:) AC_MSG_ERROR([readelf for the host is required for cross builds]) diff --git a/setup.py b/setup.py -index ddaa6d743c..67197000d2 100644 +index ddaa6d743cd..67197000d20 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,7 @@ def get_platform(): diff --git a/recipe/patches/0017-Fix-TZPATH-on-windows.patch b/recipe/patches/0017-Fix-TZPATH-on-windows.patch index d32997c5d..36ea0a543 100644 --- a/recipe/patches/0017-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0017-Fix-TZPATH-on-windows.patch @@ -1,14 +1,14 @@ -From 2fae113c00537ec301afaa4fda86c5cb90cc8a9e Mon Sep 17 00:00:00 2001 +From 479536de92fe29ef4cbf0c0f0a8aac1a02af36b8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH 17/25] Fix TZPATH on windows +Subject: [PATCH 17/27] Fix TZPATH on windows --- Lib/sysconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index daf9f00006..5d12426756 100644 +index daf9f000060..5d124267569 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -611,6 +611,7 @@ def get_config_vars(*args): diff --git a/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index 525129cad..4b8ce87b3 100644 --- a/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,7 +1,7 @@ -From f73b4815e527627674cf8c052d5d37d9da5529c6 Mon Sep 17 00:00:00 2001 +From 8d74bd3c5fe8a400d0b37696b03f63c0ab722008 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH 18/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1 +Subject: [PATCH 18/27] 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 @@ -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 e009661d4a..708d866673 100644 +index e009661d4a2..708d866673c 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1448,7 +1448,7 @@ copy_com_pointer(PyObject *self, PyObject *args) diff --git a/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch b/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch index 568d14414..c3355dc70 100644 --- a/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch +++ b/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch @@ -1,14 +1,14 @@ -From 54902079aabfe40fb40ce2efb903da6001e3f9e2 Mon Sep 17 00:00:00 2001 +From 621a2396b9879263ed8a9a8f17857b240e9e405a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:18:50 -0700 -Subject: [PATCH 19/25] Fix LDSHARED when CC is overriden on Linux too +Subject: [PATCH 19/27] Fix LDSHARED when CC is overriden on Linux too --- Lib/distutils/sysconfig.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 181f66708e..07bb42df04 100644 +index 181f66708e9..07bb42df04f 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -222,10 +222,9 @@ def customize_compiler(compiler): diff --git a/recipe/patches/0020-Unvendor-bzip2.patch b/recipe/patches/0020-Unvendor-bzip2.patch index 555ca9f61..b140c5dba 100644 --- a/recipe/patches/0020-Unvendor-bzip2.patch +++ b/recipe/patches/0020-Unvendor-bzip2.patch @@ -1,7 +1,7 @@ -From 2205362f7a6e790a4b16492b039d7fde6cfbcf05 Mon Sep 17 00:00:00 2001 +From 377d101255ea5687b4dcb81a1aee9e090b3794c5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 -Subject: [PATCH 20/25] Unvendor bzip2 +Subject: [PATCH 20/27] Unvendor bzip2 --- PCbuild/_bz2.vcxproj | 15 +++++---------- @@ -9,7 +9,7 @@ Subject: [PATCH 20/25] Unvendor bzip2 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 0402f7a9aa..569c7c5de9 100644 +index 0402f7a9aaa..569c7c5de93 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -94,7 +94,7 @@ @@ -47,7 +47,7 @@ index 0402f7a9aa..569c7c5de9 100644 diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters -index 7c0b516253..c1f960608c 100644 +index 7c0b5162537..c1f960608c3 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -21,33 +21,9 @@ diff --git a/recipe/patches/0021-Unvendor-libffi.patch b/recipe/patches/0021-Unvendor-libffi.patch index a2d34f1c2..778c0cca9 100644 --- a/recipe/patches/0021-Unvendor-libffi.patch +++ b/recipe/patches/0021-Unvendor-libffi.patch @@ -1,14 +1,14 @@ -From e26c73100163e6b4f08c1cff98df0cfcd0d99f1e Mon Sep 17 00:00:00 2001 +From 96be926cb9fe2aeea544ecfc3839a88347f78d74 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 -Subject: [PATCH 21/25] Unvendor libffi +Subject: [PATCH 21/27] Unvendor libffi --- PCbuild/libffi.props | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/PCbuild/libffi.props b/PCbuild/libffi.props -index 975c4a0d35..97fb5966bf 100644 +index 975c4a0d355..97fb5966bfb 100644 --- a/PCbuild/libffi.props +++ b/PCbuild/libffi.props @@ -2,20 +2,11 @@ diff --git a/recipe/patches/0022-Unvendor-tcltk.patch b/recipe/patches/0022-Unvendor-tcltk.patch index ccb00b4f7..3ac9b5b4a 100644 --- a/recipe/patches/0022-Unvendor-tcltk.patch +++ b/recipe/patches/0022-Unvendor-tcltk.patch @@ -1,14 +1,14 @@ -From b201ef5cfba1ffb2774baa5eeee5d25a55904d40 Mon Sep 17 00:00:00 2001 +From 593d2b046a3c412fd2c9f7dcb561f94e4cecd56c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH 22/25] Unvendor tcltk +Subject: [PATCH 22/27] Unvendor tcltk --- PCbuild/tcltk.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 6ff152970c..a46efb89d2 100644 +index 6ff152970c7..a46efb89d26 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -17,10 +17,10 @@ diff --git a/recipe/patches/0023-unvendor-xz.patch b/recipe/patches/0023-unvendor-xz.patch index cb036906b..654ad6a3d 100644 --- a/recipe/patches/0023-unvendor-xz.patch +++ b/recipe/patches/0023-unvendor-xz.patch @@ -1,14 +1,14 @@ -From 343f6c661aecad27b09171f0db30cced94a2b6f9 Mon Sep 17 00:00:00 2001 +From 0fa654de11ce3095841a6113d232f0070edd341b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 -Subject: [PATCH 23/25] unvendor xz +Subject: [PATCH 23/27] unvendor xz --- PCbuild/_lzma.vcxproj | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 0565132363..e8b2704cee 100644 +index 0565132363e..ee738e76c41 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -93,15 +93,15 @@ diff --git a/recipe/patches/0024-unvendor-zlib.patch b/recipe/patches/0024-unvendor-zlib.patch index 87aadfaf7..a14ccb24d 100644 --- a/recipe/patches/0024-unvendor-zlib.patch +++ b/recipe/patches/0024-unvendor-zlib.patch @@ -1,7 +1,7 @@ -From 7e8c6c64aec18fee7239301d2be0df03c504b98b Mon Sep 17 00:00:00 2001 +From c8d1db5666af8dfb17fa80e988c58327c8b5f12c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 -Subject: [PATCH 24/25] unvendor zlib +Subject: [PATCH 24/27] unvendor zlib --- PCbuild/pythoncore.vcxproj | 33 ++------------- @@ -9,7 +9,7 @@ Subject: [PATCH 24/25] unvendor zlib 2 files changed, 4 insertions(+), 95 deletions(-) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 215ebfdbf4..7e729e7924 100644 +index 215ebfdbf4d..7e729e79245 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -78,7 +78,7 @@ index 215ebfdbf4..7e729e7924 100644 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 55b57ef29d..2fc1a57161 100644 +index 55b57ef29dc..2fc1a571618 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -606,39 +606,6 @@ diff --git a/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index 6f0de0989..6b80ad1d1 100644 --- a/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,7 +1,7 @@ -From ca4c074efc06a5c3017f3aae78bab84b529a0927 Mon Sep 17 00:00:00 2001 +From 1342fec25aec89d6c7ac222848aa6747c5931e69 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 25/25] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 25/27] 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 0427ae321c..8ea6c81e0f 100755 +index 0427ae321cc..8ea6c81e0f7 100755 --- a/configure +++ b/configure @@ -4299,9 +4299,9 @@ if test "$ac_test_CFLAGS" = set; then @@ -35,7 +35,7 @@ index 0427ae321c..8ea6c81e0f 100755 ;; *) diff --git a/configure.ac b/configure.ac -index b23727c5fc..9c685d2661 100644 +index b23727c5fc7..9c685d26613 100644 --- a/configure.ac +++ b/configure.ac @@ -1584,7 +1584,7 @@ then diff --git a/recipe/patches/0026-Unvendor-expat.patch b/recipe/patches/0026-Unvendor-expat.patch index c92e02bb2..48a6bd5ad 100644 --- a/recipe/patches/0026-Unvendor-expat.patch +++ b/recipe/patches/0026-Unvendor-expat.patch @@ -1,7 +1,7 @@ -From 694404bc76fae025c40894c6d727ec6b70a95f84 Mon Sep 17 00:00:00 2001 +From 9aa71bc2a319a5f5bbb25766f9ee38f698b7c7c2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 28 Mar 2025 22:41:20 +0100 -Subject: [PATCH 26/25] Unvendor expat +Subject: [PATCH 26/27] Unvendor expat --- PCbuild/_elementtree.vcxproj | 22 +---------- @@ -127,10 +127,10 @@ index bc14e31f32b..7cc8e9a3b9b 100644 - -\ No newline at end of file +\ No newline at end of file + diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 26ac82980ca..2a9c12ebd37 100644 +index 26ac82980ca..302ea38fbd9 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -90,23 +90,19 @@ @@ -197,8 +197,5 @@ index fd22fc8c477..41c73b434b9 100644 - -\ No newline at end of file +\ No newline at end of file + --- -2.48.1 - diff --git a/recipe/patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch b/recipe/patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch new file mode 100644 index 000000000..5fffbb4c8 --- /dev/null +++ b/recipe/patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch @@ -0,0 +1,64 @@ +From 76d7661f10677a0054b49469fc3548931e1c9fca Mon Sep 17 00:00:00 2001 +From: David Benjamin +Date: Fri, 24 Mar 2023 09:04:30 -0400 +Subject: [PATCH 27/27] gh-100372: Use BIO_eof to detect EOF for + SSL_FILETYPE_ASN1 (GH-100373) + +In PEM, we need to parse until error and then suppress `PEM_R_NO_START_LINE`, because PEM allows arbitrary leading and trailing data. DER, however, does not. Parsing until error and suppressing `ASN1_R_HEADER_TOO_LONG` doesn't quite work because that error also covers some cases that should be rejected. + +Instead, check `BIO_eof` early and stop the loop that way. + +Automerge-Triggered-By: GH:Yhg1s +--- + Lib/test/test_ssl.py | 2 ++ + Modules/_ssl.c | 10 ++++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +index 0f1397de732..f4bba8ff037 100644 +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -1533,6 +1533,8 @@ def test_load_verify_cadata(self): + "not enough data: cadata does not contain a certificate" + ): + ctx.load_verify_locations(cadata=b"broken") ++ with self.assertRaises(ssl.SSLError): ++ ctx.load_verify_locations(cadata=cacert_der + b"A") + + @unittest.skipIf(Py_DEBUG_WIN32, "Avoid mixing debug/release CRT on Windows") + def test_load_dh_params(self): +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index 3bd8b96dcc4..af770c7f18a 100644 +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -3961,7 +3961,7 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len, + { + BIO *biobuf = NULL; + X509_STORE *store; +- int retval = -1, err, loaded = 0; ++ int retval = -1, err, loaded = 0, was_bio_eof = 0; + + assert(filetype == SSL_FILETYPE_ASN1 || filetype == SSL_FILETYPE_PEM); + +@@ -3989,6 +3989,10 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len, + int r; + + if (filetype == SSL_FILETYPE_ASN1) { ++ if (BIO_eof(biobuf)) { ++ was_bio_eof = 1; ++ break; ++ } + cert = d2i_X509_bio(biobuf, NULL); + } else { + cert = PEM_read_bio_X509(biobuf, NULL, +@@ -4024,9 +4028,7 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len, + } + _setSSLError(get_state_ctx(self), msg, 0, __FILE__, __LINE__); + retval = -1; +- } else if ((filetype == SSL_FILETYPE_ASN1) && +- (ERR_GET_LIB(err) == ERR_LIB_ASN1) && +- (ERR_GET_REASON(err) == ASN1_R_HEADER_TOO_LONG)) { ++ } else if ((filetype == SSL_FILETYPE_ASN1) && was_bio_eof) { + /* EOF ASN1 file, not an error */ + ERR_clear_error(); + retval = 0; diff --git a/recipe/patches/make-mixed-crlf-patch.py b/recipe/patches/make-mixed-crlf-patch.py index 9e714118c..ccf46fa2f 100644 --- a/recipe/patches/make-mixed-crlf-patch.py +++ b/recipe/patches/make-mixed-crlf-patch.py @@ -42,7 +42,7 @@ def main(argv): line.startswith('+++ ') or \ line.startswith('@@ ') or \ line.startswith('index ') or \ - (i < len(lines) - 1 and lines[i+1].startswith("\ No newline at end of file")): + (i < len(lines) - 1 and lines[i+1].startswith(r"\ No newline at end of file")): fo.write((line + '\n').encode('utf-8')) else: fo.write((line + '\r\n').encode('utf-8')) diff --git a/recipe/run_test.py b/recipe/run_test.py index 954e693b4..c56944782 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -103,3 +103,11 @@ # See https://github.com/conda-forge/python-feedstock/issues/718 for context: assert sys.hash_info.algorithm.startswith("siphash") + +# xref https://github.com/conda-forge/openssl-feedstock/issues/237 +import ssl +print("openssl:", ssl.OPENSSL_VERSION) +pem = ssl.get_server_certificate(("pypi.org", 443)) +der = ssl.PEM_cert_to_DER_cert(pem) +ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) +ctx.load_verify_locations(cadata=der)