diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ab5a161f..d1d3f47f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,49 +11,75 @@ jobs: 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 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 + SHORT_CONFIG: osx_64_build_typedebugchannel_targetscon_h5e478946 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 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 + SHORT_CONFIG: osx_64_build_typedebugchannel_targetscon_h116d3356 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 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 + SHORT_CONFIG: osx_64_build_typereleasechannel_targetsc_h425d4db0 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 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 + SHORT_CONFIG: osx_64_build_typereleasechannel_targetsc_haa8f77b8 osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno: CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15-arm64 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 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' + VMIMAGE: macOS-15-arm64 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 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' + VMIMAGE: macOS-15-arm64 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 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' + VMIMAGE: macOS-15-arm64 + build_workspace_dir: ~/miniforge3/conda-bld + store_build_artifacts: true + tools_install_dir: ~/miniforge3 SHORT_CONFIG: osx_arm64_build_typereleasechannel_targe_h92a1d5a6 - VMIMAGE: macOS-15 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) @@ -72,21 +98,23 @@ 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 CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments + # Archive everything in CONDA_BLD_PATH except environments export BLD_ARTIFACT_PREFIX=conda_artifacts if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails + # 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: succeededOrFailed() + condition: and(succeededOrFailed(), eq(variables.store_build_artifacts, true)) - task: PublishPipelineArtifact@1 displayName: Store conda build artifacts diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c8dc849a..96fe604a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,15 +11,19 @@ jobs: win_64_freethreadingno: CONFIG: win_64_freethreadingno UPLOAD_PACKAGES: 'True' + build_workspace_dir: D:\\bld\\ + store_build_artifacts: true + tools_install_dir: D:\Miniforge SHORT_CONFIG: win_64_freethreadingno win_64_freethreadingyes: CONFIG: win_64_freethreadingyes UPLOAD_PACKAGES: 'True' + build_workspace_dir: D:\\bld\\ + store_build_artifacts: true + tools_install_dir: D:\Miniforge SHORT_CONFIG: win_64_freethreadingyes timeoutInMinutes: 360 variables: - CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: @@ -28,8 +32,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 @@ -41,20 +45,21 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | - set MINIFORGE_HOME=$(MINIFORGE_HOME) + 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 CONDA_BLD_DIR=$(CONDA_BLD_PATH) 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: succeededOrFailed() + condition: and(succeededOrFailed(), eq(variables.store_build_artifacts, true)) - task: PublishPipelineArtifact@1 displayName: Store conda build artifacts diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 35a97233..368cb6bd 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -19,7 +19,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' freethreading: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index b806c0f6..224befc1 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -19,7 +19,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' freethreading: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 9e32f337..d3785160 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -19,7 +19,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' freethreading: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index ec6ae1ba..048e23aa 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -19,7 +19,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' freethreading: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index f4645c5b..a09c673a 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -23,65 +23,125 @@ jobs: matrix: include: - CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_64_build_typedebugchannel_targetsc_h10d856d4 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_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_64_build_typedebugchannel_targetsc_hf83d9e2d 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_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_64_build_typereleasechannel_target_h01f3c156 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_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_64_build_typereleasechannel_target_hf5ff4d16 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_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_aarch64_build_typedebugchannel_tar_hd2db0a21 UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + 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_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_aarch64_build_typedebugchannel_tar_h51de9693 UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + 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_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_aarch64_build_typereleasechannel_t_hccc48f4a UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + 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_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_aarch64_build_typereleasechannel_t_h78d2c7f5 UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + 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_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_ppc64le_build_typedebugchannel_tar_hac8bb296 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_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_ppc64le_build_typedebugchannel_tar_hb74ed675 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_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_ppc64le_build_typereleasechannel_t_h5454d1d5 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_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes + STORE_BUILD_ARTIFACTS: True + SHORT_CONFIG: linux_ppc64le_build_typereleasechannel_t_hed84b2c3 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 @@ -91,11 +151,13 @@ jobs: 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.CONDA_FORGE_DOCKER_RUN_ARGS }}" + 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 }} @@ -115,6 +177,8 @@ jobs: 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 @@ -122,6 +186,8 @@ jobs: 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 @@ -140,6 +206,8 @@ jobs: 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 @@ -152,14 +220,88 @@ jobs: 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 + 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 }} \ No newline at end of file + 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 47b5408a..86a9c55b 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 853faaab..afbbdb77 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -36,7 +36,7 @@ mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d- echo > /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 index 0bb6fc0b..6120712c 100755 --- a/.scripts/create_conda_build_artifacts.bat +++ b/.scripts/create_conda_build_artifacts.bat @@ -7,7 +7,7 @@ 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_DIR (path to the conda-bld directory) +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) @@ -20,7 +20,7 @@ rem ENV_ARTIFACT_NAME rem ENV_ARTIFACT_PATH rem Check that the conda-build directory exists -if not exist %CONDA_BLD_DIR% ( +if not exist %CONDA_BLD_PATH% ( echo conda-build directory does not exist exit 1 ) @@ -42,7 +42,7 @@ if defined BLD_ARTIFACT_PREFIX ( 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_DIR%" -xr^^!.git/ -xr^^!_*_env*/ -xr^^!*_cache/ -bb + 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! @@ -62,7 +62,7 @@ if defined ENV_ARTIFACT_PREFIX ( 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_DIR%"/_*_env*/ -bb + 7z a "!ENV_ARTIFACT_PATH!" -r "%CONDA_BLD_PATH%"/_*_env*/ -bb if errorlevel 1 exit 1 echo ENV_ARTIFACT_PATH: !ENV_ARTIFACT_PATH! diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh index 819c3b9c..1e3acc78 100755 --- a/.scripts/create_conda_build_artifacts.sh +++ b/.scripts/create_conda_build_artifacts.sh @@ -7,7 +7,7 @@ # FEEDSTOCK_NAME # CONFIG (build matrix configuration string) # SHORT_CONFIG (uniquely-shortened configuration string) -# CONDA_BLD_DIR (path to the conda-bld directory) +# 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) @@ -26,7 +26,7 @@ source .scripts/logging_utils.sh set -e # Check that the conda-build directory exists -if [ ! -d "$CONDA_BLD_DIR" ]; then +if [ ! -d "$CONDA_BLD_PATH" ]; then echo "conda-build directory does not exist" exit 1 fi @@ -64,8 +64,8 @@ if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then ( 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_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then - pushd "$CONDA_BLD_DIR" + 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 @@ -92,8 +92,8 @@ if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then ( 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_DIR"/'_*_env*/' -bb; then - pushd "$CONDA_BLD_DIR" + 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 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bac7141a..b0eda55c 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 27c552b1..c07d98e6 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 48d0ae38..dcf4795e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,14 @@ Current build status ==================== - +
+ + + @@ -59,90 +66,6 @@ Current build status
GitHub Actions + + + +
Azure
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno - - variant - -
linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes - - variant - -
linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno - - variant - -
linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes - - variant - -
linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno - - variant - -
linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes - - variant - -
linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno - - variant - -
linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes - - variant - -
linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno - - variant - -
linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes - - variant - -
linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno - - variant - -
linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes - - variant - -
osx_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno diff --git a/conda-forge.yml b/conda-forge.yml index 3bdeb323..2db97072 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,3 @@ -azure: - store_build_artifacts: true bot: abi_migration_branches: - '3.8' @@ -8,9 +6,7 @@ bot: - '3.11' - '3.12' build_platform: - linux_aarch64: linux_64 linux_ppc64le: linux_64 - osx_arm64: osx_64 conda_build: pkg_format: '2' conda_forge_output_validation: true @@ -19,5 +15,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 494eee38..4f63c865 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.13.13" %} +{% set version = "3.13.14" %} {% 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: 2ab91ff401783ccca64f75d10c882e957bdfd60e2bf5a72f8421793729b78a71 + sha256: 639e43243c620a308f968213df9e00f2f8f62332f7adbaa7a7eeb9783057c690 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 dbf4efd0..bed70443 100644 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,4 +1,4 @@ -From a70742c0b7ff8e15b948a74e112f1c5542cf8e57 Mon Sep 17 00:00:00 2001 +From c7e9f12eaec378e006ec17a76eb59e44605becb7 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 @@ -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 5bd9b7732a4..504f79e8998 100644 +index f69df694d44..1761960c928 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -45,7 +45,7 @@ diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index 716b2857..49ff8be3 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,4 +1,4 @@ -From 3a4008e96246da906293908fbb4606040f959573 Mon Sep 17 00:00:00 2001 +From a1636e8a748b106892891ff17fb11060e9c7711d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/25] Win32: Do not download externals 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 93845015..6ead13d6 100644 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,4 +1,4 @@ -From 88bd8f9025833f84620ef05689285bf8f49d0092 Mon Sep 17 00:00:00 2001 +From f21d3e9f2984677c726a307b9da580db7f4b2db2 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/25] Fix find_library so that it looks in sys.prefix/lib 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 ab74fe05..ec46ab40 100644 --- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,4 +1,4 @@ -From 41a3e039bf637311f375d30d939d4486dc3aff0d Mon Sep 17 00:00:00 2001 +From 71c92b8c1565919a1ac78de90374ff0fc3970222 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 0501ec79..2f32c9c7 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From bffdcfa936322c7bf70469c2b7839b1b84b62785 Mon Sep 17 00:00:00 2001 +From 1692383c6cfbdc31360f83671a8605fbe016b877 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/25] Unvendor openssl @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index c29caa61bbd..d0d58ce57e4 100644 +index 64e4cd08db7..d0d58ce57e4 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -62,6 +62,7 @@ @@ -112,8 +112,8 @@ index c29caa61bbd..d0d58ce57e4 100644 - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include $(ExternalsDir)\mpdecimal-4.0.0\ -- $(ExternalsDir)openssl-3.0.19\ -- $(ExternalsDir)openssl-bin-3.0.19\$(ArchName)\ +- $(ExternalsDir)openssl-3.0.21\ +- $(ExternalsDir)openssl-bin-3.0.21\$(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 45c33d67..a5be16d5 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 54ebce771e1cc5f36d69ca80277786f709ae41ce Mon Sep 17 00:00:00 2001 +From 907f0473e1e0dd93822652e9a8d715c969765416 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/25] Unvendor sqlite3 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index 949219c0..8b8eb350 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 91619d973f19541cef025dc1ff192feed29fd1ce Mon Sep 17 00:00:00 2001 +From bc4bfaefdbbe1cd8a7c332b369345b52aea22ab2 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/25] Add CondaEcosystemModifyDllSearchPath() @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando 1 file changed, 96 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 8ba9b2bd006..fb397de1ffb 100644 +index fbbc38bc8e1..05e587d8ea5 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 c3f050e8..2e50f60c 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 87116ba01329804b3fdca98410416c075bd6c27e Mon Sep 17 00:00:00 2001 +From fee1892d10c7e87625644e7ec104c9e7e7119828 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/25] Doing d1trimfile @@ -436,7 +436,7 @@ index 4e721e8ce09..3fec7516ed5 100644 \ No newline at end of file + diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 44dbf234813..ec791cfe60c 100644 +index 02d755f8d5c..f28e1a4fc3b 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 41c380fd..d49fcb28 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 1c3831e5afa7bf46f2525f8dd7ab08073b7d545e Mon Sep 17 00:00:00 2001 +From c1eb30b6ac336252bdca47ddbaa4e224b9bc0a4b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/25] cross compile darwin @@ -29,7 +29,7 @@ index 8895177e326..fd93841d034 100755 try: import plistlib diff --git a/configure b/configure -index 9ddb712b534..9e3d1d4929a 100755 +index 0df47513085..b73dfedcf4b 100755 --- a/configure +++ b/configure @@ -4052,6 +4052,9 @@ then @@ -53,7 +53,7 @@ index 9ddb712b534..9e3d1d4929a 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index d9acfce793e..ca97817db17 100644 +index a016a439c6c..af0edff6bab 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 c572cfb7..91596641 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 598cafbb2d198448c9ccc5085d165bedaa2d1b79 Mon Sep 17 00:00:00 2001 +From e63d750b123d8cae51f3b89e3c05c3884d37016d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/25] Fix TZPATH on windows 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 793fdf2e..83ab22e5 100644 --- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,4 +1,4 @@ -From 6d35fd22703f762a7b497b4ae3ac2702650a80c2 Mon Sep 17 00:00:00 2001 +From e595ceb8e7a291a8465d1054bcbeddf0804852c7 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1 diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 0b3dd37e..68f68548 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From bdb7cb70431d64debe347a4112d85c165006aafb Mon Sep 17 00:00:00 2001 +From c15fd9a8f7ab62e0112a7c7b5e2d0a2d2c38c757 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/25] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index c3e21303..3860d12d 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From b8a4cd2e7c9b4a46d6d6f61311116983ee8a6fc9 Mon Sep 17 00:00:00 2001 +From cc3d09d1de20437a96250a1233b20731249de022 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/25] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 2ca00730..876ed896 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From 0ad0879eec0bd6349a479894db2758121dd3d2ab Mon Sep 17 00:00:00 2001 +From 33f0a541f7aede6d154dc14bbdd04e32ca2fb370 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/25] Unvendor tcltk diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index e10f61c8..0857bf26 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 12182663cc91d74bc19715cfcf1b857c90654e59 Mon Sep 17 00:00:00 2001 +From abfa71822ad19ab49c352d845ecc17e93565c04c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/25] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 006ee075..d5117f00 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 7aa5e5e91bfd9a52ea08e6737824299435fd59c2 Mon Sep 17 00:00:00 2001 +From e74368fea5d5d0528d2a34d63dbf0c88b12f6532 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/25] unvendor zlib 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 4f7c708c..bdd10ddb 100644 --- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,4 +1,4 @@ -From 717d9f0257864959e279715d9548bdb9f9245e58 Mon Sep 17 00:00:00 2001 +From bcd25185a2171173b2a67419c336b5df5c23c72b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/25] Do not pass -g to GCC when not Py_DEBUG @@ -10,7 +10,7 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 9e3d1d4929a..50a25868016 100755 +index b73dfedcf4b..afbce0196a9 100755 --- a/configure +++ b/configure @@ -5671,9 +5671,9 @@ if test $ac_test_CFLAGS; then @@ -25,7 +25,7 @@ index 9e3d1d4929a..50a25868016 100755 fi else if test "$GCC" = yes; then -@@ -9559,7 +9559,7 @@ then +@@ -9610,7 +9610,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -35,10 +35,10 @@ index 9e3d1d4929a..50a25868016 100755 ;; *) diff --git a/configure.ac b/configure.ac -index ca97817db17..c88fcca1967 100644 +index af0edff6bab..04a755b13e7 100644 --- a/configure.ac +++ b/configure.ac -@@ -2392,7 +2392,7 @@ then +@@ -2414,7 +2414,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 f7f68c21..fc2ec327 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From 7b0d94fe8148aedb83dbdf911e37b1cd162dc6ab Mon Sep 17 00:00:00 2001 +From fc4e4cc1fdb544b4970d6c0ff509f261cffd1b90 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/25] Unvendor expat diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 17adbae7..5c2f88b6 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 0c5ec96d061cc0769c7c577ec687604249198537 Mon Sep 17 00:00:00 2001 +From 54c89b64882eeb1538954eeb630b0bc65ddff98c Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/25] Remove unused readelf @@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``. 1 file changed, 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index ecf77bdc41c..190eb5a1d1f 100644 +index 8589a28b726..a98a222dc44 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 5911d447..45055e35 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From f94236352a144cc0815b630352b8586b7a08ebac Mon Sep 17 00:00:00 2001 +From b87947a4ca6a5a66778c9e7854d53a3d8bbd9af2 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling @@ -10,7 +10,7 @@ Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index 190eb5a1d1f..8f170a02a80 100644 +index a98a222dc44..70f99fcbf54 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 a114ff5f..ade6db41 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From bdffd18d709e2fb55999928117e97399f6a49273 Mon Sep 17 00:00:00 2001 +From a4589646710f15a5c856a8cc1aa817bdbea22033 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/25] Override configure LIBFFI @@ -8,10 +8,10 @@ Subject: [PATCH 21/25] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 50a25868016..e5140a6b6c9 100755 +index afbce0196a9..8d9de5de28a 100755 --- a/configure +++ b/configure -@@ -14530,7 +14530,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -14581,7 +14581,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 0bc7dbd7..ae18033d 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From 94f837c0c46e6e5c4454ea594955f431064c85e2 Mon Sep 17 00:00:00 2001 +From 1bc8184c8e44c2134126ea8b3a44cd41ab26270f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/25] Unvendor libmpdec diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 4efdf0dd..d51796a6 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From fbc76946acb1d2808eb8a17410dc546070d9fef0 Mon Sep 17 00:00:00 2001 +From 1de851237b4795330de4d77bc59aa1dc214f91b3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/25] Brand conda-forge 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 3469df82..13ede021 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,4 +1,4 @@ -From cf10296511485f2fba7912f0ad3e9b72a9da590f Mon Sep 17 00:00:00 2001 +From 554972ba0633f88514a38cb70e587608a4678808 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/25] Do not define pid_t as it might conflict with the @@ -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 51baf1e8ef6..26f988b2fdd 100644 +index c18b9713b0c..410b2d72402 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -23,6 +23,10 @@ @@ -44,7 +44,7 @@ index 51baf1e8ef6..26f988b2fdd 100644 # error "The public headers should not include , see gh-48924" #endif diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c -index e2af09d0840..24715ac5182 100644 +index 35505ef33f4..e4a0beeb793 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -8,6 +8,10 @@ @@ -74,7 +74,7 @@ index dabce06705a..7718c09e829 100644 "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n" "--\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 78a8776c1ca..e48910a09bb 100644 +index 86187cbeb47..5b262e78d69 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 213e80dc..a9e29899 100644 --- a/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch +++ b/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch @@ -1,4 +1,4 @@ -From 58314111df23981c3dfe1c120c0acacb13a4d79f Mon Sep 17 00:00:00 2001 +From b1ceec3f7ca1dbfd89f5201b567819d4eacc9fe9 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 3 Sep 2025 13:32:24 +0200 Subject: [PATCH 25/25] Search LLVM_ROOT for llvm binaries @@ -8,10 +8,10 @@ Subject: [PATCH 25/25] Search LLVM_ROOT for llvm binaries 1 file changed, 5 insertions(+) diff --git a/Tools/jit/_llvm.py b/Tools/jit/_llvm.py -index 606f280a14d..95974f5f700 100644 +index b68da1b6be1..88070133ddb 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: +@@ -68,6 +68,11 @@ async def _get_brew_llvm_prefix(*, echo: bool = False) -> str | None: @_async_cache async def _find_tool(tool: str, *, echo: bool = False) -> str | None: diff --git a/recipe/run_test.py b/recipe/run_test.py index de0a8181..50b64868 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -106,3 +106,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)