diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml old mode 100755 new mode 100644 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 9c460bb69..000000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,101 +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: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_freethreadingno: - CONFIG: win_64_freethreadingno - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: true - tools_install_dir: D:\Miniforge - CONFIG_SHORT: win_64_freethreadingno - win_64_freethreadingyes: - CONFIG: win_64_freethreadingyes - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: true - tools_install_dir: D:\Miniforge - CONFIG_SHORT: win_64_freethreadingyes - win_arm64_freethreadingno: - CONFIG: win_arm64_freethreadingno - UPLOAD_PACKAGES: 'True' - build_workspace_dir: C:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: true - tools_install_dir: C:\Miniforge - CONFIG_SHORT: win_arm64_freethreadingno - win_arm64_freethreadingyes: - CONFIG: win_arm64_freethreadingyes - UPLOAD_PACKAGES: 'True' - build_workspace_dir: C:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: true - tools_install_dir: C:\Miniforge - CONFIG_SHORT: win_arm64_freethreadingyes - timeoutInMinutes: 360 - variables: - UPLOAD_TEMP: D:\\tmp - - steps: - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - CI: azure - CONFIG: $(CONFIG) - CONDA_BLD_PATH: $(build_workspace_dir) - MINIFORGE_HOME: $(tools_install_dir) - PYTHONUNBUFFERED: 1 - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - - script: | - set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory - set BLD_ARTIFACT_PREFIX=conda_artifacts - set CI=azure - set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - set CONDA_BLD_PATH=$(build_workspace_dir) - set FEEDSTOCK_NAME=$(build.Repository.Name) - set MINIFORGE_HOME=$(tools_install_dir) - 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_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml index 52322e5f7..514e04fd0 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml index 23281b90c..aaf271fdc 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml index 02782d80a..a1e1bf32c 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml index fab317978..c2c802945 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml index 2bb7c3be6..277021b09 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 expat: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml index 9cc42a3f9..d3509ef59 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 expat: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml index 70d5afa7b..671123569 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 expat: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml index 807862b58..22a5f2603 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 expat: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml index 5ce67fb9d..6194b695f 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml index 8f1e10f53..7fb65f4c7 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_dev_debugfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml index 190ad8665..2eba198ba 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingno.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml index 3009c402e..819717958 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_python_devfreethreadingyes.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 expat: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index b0d24fc08..fca1a1a00 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -178,10 +178,62 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 + - CONFIG: win_64_freethreadingno + CONFIG_SHORT: win_64_freethreadingno + STORE_BUILD_ARTIFACTS: True + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_64_freethreadingyes + CONFIG_SHORT: win_64_freethreadingyes + STORE_BUILD_ARTIFACTS: True + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_arm64_freethreadingno + CONFIG_SHORT: win_arm64_freethreadingno + STORE_BUILD_ARTIFACTS: True + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_arm64_freethreadingyes + CONFIG_SHORT: win_arm64_freethreadingyes + STORE_BUILD_ARTIFACTS: True + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Configure binfmt_misc if: matrix.os == 'ubuntu' shell: bash @@ -210,7 +262,7 @@ jobs: run: | export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" + export GIT_BRANCH="${GITHUB_REF_NAME}" export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" export flow_run_id="github_$GITHUB_RUN_ID" export remote_url="https://github.com/$GITHUB_REPOSITORY" @@ -240,7 +292,7 @@ jobs: run: | export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" + export GIT_BRANCH="${GITHUB_REF_NAME}" export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" export flow_run_id="github_$GITHUB_RUN_ID" export remote_url="https://github.com/$GITHUB_REPOSITORY" @@ -262,6 +314,7 @@ jobs: set "sha=%GITHUB_SHA%" call ".scripts\run_win_build.bat" env: + BUILD_PLATFORM: ${{ matrix.build_platform }} CI: github_actions CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} CONFIG: ${{ matrix.CONFIG }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5c97f7442..484acddad 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -67,7 +67,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # - --output-id vs. --output-name # - --clobber-file vs. none # - none vs. --target-platform - conda debug \ + CONDA_SUBDIR="${BUILD_PLATFORM}" conda debug \ "${RECIPE_ROOT}" \ -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ @@ -83,7 +83,7 @@ else # - --clobber-file vs. none # - none vs. --target-platform # - --extra-meta a=b c=d vs. --extra-meta a=b --extra-meta c=d - conda-build \ + CONDA_SUBDIR="${BUILD_PLATFORM}" conda-build \ "${RECIPE_ROOT}" \ -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh old mode 100644 new mode 100755 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b0eda55cd..9d7c39125 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -100,7 +100,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + CONDA_SUBDIR="${BUILD_PLATFORM}" conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml @@ -112,7 +112,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + CONDA_SUBDIR="${BUILD_PLATFORM}" conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index c07d98e61..06f61b83b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -76,8 +76,12 @@ call :end_group :: Build the recipe echo Building recipe +set "_OLD_CONDA_SUBDIR=%CONDA_SUBDIR%" +set "CONDA_SUBDIR=%BUILD_PLATFORM%" conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +set "_OLD_CONDA_SUBDIR=" +set "CONDA_SUBDIR=%_OLD_CONDA_SUBDIR%" call :start_group "Inspecting artifacts" :: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 @@ -87,7 +91,7 @@ call :end_group :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" - set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + set "GIT_BRANCH=%GITHUB_REF_NAME%" if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( set "IS_PR_BUILD=True" ) else ( diff --git a/README.md b/README.md index b2d758722..51746589b 100644 --- a/README.md +++ b/README.md @@ -121,20 +121,6 @@ Current build status variant - - win_64_freethreadingno - - - variant - - - - win_64_freethreadingyes - - - variant - - @@ -159,50 +145,94 @@ Current release info Installing python ================= -Installing `python` from the `conda-forge/label/python_dev` channel can be achieved by adding `conda-forge/label/python_dev` to your channels with: +Installing `python` from the `conda-forge/label/python_dev_debug` channel can be achieved by adding `conda-forge/label/python_dev_debug` to your channels with: ``` -conda config --add channels conda-forge/label/python_dev +conda config --add channels conda-forge/label/python_dev_debug conda config --set channel_priority strict ``` -Once the `conda-forge/label/python_dev` channel has been enabled, `cpython, libpython, libpython-static, python, python-freethreading, python-gil, python-jit` can be installed with `conda`: +How to use +---------- + +
+With conda ``` conda install cpython libpython libpython-static python python-freethreading python-gil python-jit ``` -or with `mamba`: +
+ +
+With mamba ``` mamba install cpython libpython libpython-static python python-freethreading python-gil python-jit ``` -It is possible to list all of the versions of `cpython` available on your platform with `conda`: +
+ +
+With pixi + +``` +# for adding to your local project +pixi add cpython libpython libpython-static python python-freethreading python-gil python-jit +# for installing globally +pixi global install cpython libpython libpython-static python python-freethreading python-gil python-jit +``` + +
+ +Search package versions +----------------------- + +It is possible to list all of the versions of `cpython` available on your platform: + +
+With conda + +``` +conda search cpython --channel conda-forge/label/python_dev_debug +``` + +
+ +
+With mamba ``` -conda search cpython --channel conda-forge/label/python_dev +mamba search cpython --channel conda-forge/label/python_dev_debug ``` -or with `mamba`: +
+ +
+With pixi ``` -mamba search cpython --channel conda-forge/label/python_dev +pixi search cpython --channel conda-forge/label/python_dev_debug ``` -Alternatively, `mamba repoquery` may provide more information: +
+ +
+With mamba repoquery, which may provide more information ``` # Search all versions available on your platform: -mamba repoquery search cpython --channel conda-forge/label/python_dev +mamba repoquery search cpython --channel conda-forge/label/python_dev_debug # List packages depending on `cpython`: -mamba repoquery whoneeds cpython --channel conda-forge/label/python_dev +mamba repoquery whoneeds cpython --channel conda-forge/label/python_dev_debug # List dependencies of `cpython`: -mamba repoquery depends cpython --channel conda-forge/label/python_dev +mamba repoquery depends cpython --channel conda-forge/label/python_dev_debug ``` +
+ About conda-forge ================= diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 03594e446..7e0f633df 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,5 +28,4 @@ stages: condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) dependsOn: Check jobs: - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/recipe/build_base.sh b/recipe/build_base.sh index d7b98f46e..a4552fba5 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -394,10 +394,27 @@ SYSCONFIG=$(find ${_buildd_shared}/${BUILD_DIR} -name "_sysconfigdata*.py" -prin cat ${SYSCONFIG} | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \ "${_FLAGS_REPLACE[@]}" \ > ${PREFIX}/lib/python${VERABI_NO_DBG}/$(basename ${SYSCONFIG}) -BUILD_DETAILS=${_buildd_shared}/${BUILD_DIR}/build-details.json -cp ${BUILD_DETAILS} ${PREFIX}/lib/python${VERABI_NO_DBG}/ + +if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then + # build-details.json is incorrect when cross-compiling: + # https://github.com/python/cpython/issues/136267 + if [[ -n ${CROSSCOMPILING_EMULATOR} ]]; then + # let's use emulation to run the just-built python and generate the correct file + LD_LIBRARY_PATH=build-shared/ build-shared/python Tools/build/generate-build-details.py \ + ${PREFIX}/lib/python${VERABI_NO_DBG}/build-details.json + else + echo "Generating build-details.json for cross without an emulator is not" + echo "supported right now." + exit 1 + fi +else + BUILD_DETAILS=${_buildd_shared}/${BUILD_DIR}/build-details.json + cp ${BUILD_DETAILS} ${PREFIX}/lib/python${VERABI_NO_DBG}/ +fi + MAKEFILE=$(find ${PREFIX}/lib/python${VERABI_NO_DBG}/ -path "*config-*/Makefile" -print0) cp ${MAKEFILE} /tmp/Makefile-$$ + cat /tmp/Makefile-$$ | ${SYS_PYTHON} "${RECIPE_DIR}"/replace-word-pairs.py \ "${_FLAGS_REPLACE[@]}" \ > ${MAKEFILE} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3753bf5f5..31289cbff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ {% set version = "3.15.0" %} -{% set dev = "b4" %} +{% set dev = "rc1" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 1 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -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: 93efb9c88d7b6633368e7f7b8f8db6e98988f7f761c09b77849447262841ce3a + sha256: f84dad680ab2147417d2739355c2678f0f9acffe4ae8ef77895de1454b384b07 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch