From 500890d8f094dc9ef1d9853f6664c95b0cd824fe Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Wed, 22 Feb 2017 01:41:09 +0000 Subject: [PATCH 01/24] MNT: Updated the feedstock for conda-smithy version 2.1.0. --- .gitattributes | 22 -------- .travis.yml | 72 ++++++++++++++++++--------- README.md | 13 ++++- appveyor.yml | 64 ++++++++++++++++++++++++ ci_support/fast_finish_ci_pr_build.sh | 4 ++ ci_support/run_docker_build.sh | 59 ++++++++++++++++++++++ circle.yml | 19 +++++++ recipe/LICENSE.txt | 2 +- 8 files changed, 208 insertions(+), 47 deletions(-) create mode 100644 appveyor.yml create mode 100755 ci_support/fast_finish_ci_pr_build.sh create mode 100755 ci_support/run_docker_build.sh create mode 100644 circle.yml diff --git a/.gitattributes b/.gitattributes index 7f3276384..288029dca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,27 +1,5 @@ * text=auto -*.patch binary -*.diff binary meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf - -# github helper pieces to make some files not show up in diffs automatically -.azure-pipelines/* linguist-generated=true -.circleci/* linguist-generated=true -.ci_support/README linguist-generated=true -.drone/* linguist-generated=true -.drone.yml linguist-generated=true -.github/* linguist-generated=true -.travis/* linguist-generated=true -.appveyor.yml linguist-generated=true -.gitattributes linguist-generated=true -.gitignore linguist-generated=true -.travis.yml linguist-generated=true -.scripts/* linguist-generated=true -.woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true -azure-pipelines.yml linguist-generated=true -build-locally.py linguist-generated=true -shippable.yml linguist-generated=true diff --git a/.travis.yml b/.travis.yml index 1d3625b27..f3c54f35c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,29 +3,55 @@ language: generic - - -matrix: - include: - - env: CONFIG=linux_aarch64_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal +os: osx +osx_image: xcode6.4 + +env: + matrix: + + - CONDA_PY=35 + global: + # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. + - secure: "nkZ1RWSP1PIRI6OqCwqeLrib7nXeBzX7PJg+P72RH1LQ56SZCdzqmvr3IoC2gxayZBzDnFsq7bU1ypy/gNtKDfWaXJvUQVKcKrbWF6dQxVXP/X5go+y9stSjI/WGXMbBr8ZwePR3lDmEPifEKdpgOaMWosqnK+ThtRNdxqKbnzRB6cOJSCcRGIMexauJg+IkPyQ5MFh59VHLdvfxfqNXa1Kdv2WkgfKX+apjLlCJoDP34zUcGFyIccbbq130AW0aYiJV3ZJIIVfcAgJqS7Ons0X3biA7/Fp6AWQKx91Ew/aoN3xb878CVr5ygKqjDdVkZClW2JEaSW9w+WG7RWomPJIPvmAuoKg50S4D07iBZf89Hjg+oybZ17ct+OA1UdW8EK8c/gaPFQsBuN1sRG2DNAJug+ViPPl7hnoAfRhRcPnUEuLcPJ6kyEcpYZgPE3MMRtjIiRRyNRzccinjxjPbojFTkiCHM9U9krFVGwIKNHp6623rttriu9YGU7yd6wRGbD09AUajT8r9iPn2OJ1+ibzCIbzJx6Nb7290+Fs4UbU29m1bAiabBTnN6EVim20tMtqCxA6HNbji30SBB/C+lQ/pf9D16Nxy+FCEdQXb193iqBxhjzEpJZHkFY/g8b1C6yJGi6dzbNDKT63HbGduQUZ99rKMmI8XaAf3ANRm/Vs=" + + +before_install: + # Fast finish the PR. + - | + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 + + # Remove homebrew. + - | + echo "" + echo "Removing homebrew from Travis CI to avoid conflicts." + curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew + chmod +x ~/uninstall_homebrew + ~/uninstall_homebrew -fq + rm ~/uninstall_homebrew + + +install: + # Install Miniconda. + - | + echo "" + echo "Installing a fresh version of Miniconda." + MINICONDA_URL="https://repo.continuum.io/miniconda" + MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" + curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" + bash $MINICONDA_FILE -b + + # Configure conda. + - | + echo "" + echo "Configuring conda." + source /Users/travis/miniconda3/bin/activate root + conda config --remove channels defaults + conda config --add channels defaults + conda config --add channels conda-forge + conda config --set show_channel_urls true + conda install --yes --quiet conda-forge-build-setup + source run_conda_forge_build_setup script: - export CI=travis diff --git a/README.md b/README.md index 0e6c8c19d..2a0b18dea 100644 --- a/README.md +++ b/README.md @@ -145,6 +145,18 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libpython--static-green.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python-green.svg)](https://anaconda.org/conda-forge/python) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | +Current build status +==================== + +Linux: [![Circle CI](https://circleci.com/gh/conda-forge/python-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/python-feedstock) +OSX: [![TravisCI](https://travis-ci.org/conda-forge/python-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/python-feedstock) +Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/python-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/python-feedstock/branch/master) + +Current release info +==================== +Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python/badges/version.svg)](https://anaconda.org/conda-forge/python) +Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python/badges/downloads.svg)](https://anaconda.org/conda-forge/python) + Installing python ================= @@ -192,7 +204,6 @@ mamba repoquery whoneeds libpython-static --channel conda-forge mamba repoquery depends libpython-static --channel conda-forge ``` - About conda-forge ================= diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..5e49ab112 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,64 @@ +# This file was automatically generated by conda-smithy. To update a component of this +# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run +# "conda smithy rerender". + +environment: + + # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the + # /E:ON and /V:ON options are not enabled in the batch script intepreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd" + + BINSTAR_TOKEN: + # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. + secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC + + matrix: + - TARGET_ARCH: x86 + CONDA_PY: 35 + CONDA_INSTALL_LOCN: C:\\Miniconda35 + + - TARGET_ARCH: x64 + CONDA_PY: 35 + CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 + + +# We always use a 64-bit machine, but can build x86 distributions +# with the TARGET_ARCH variable. +platform: + - x64 + +install: + # If there is a newer build queued for the same PR, cancel this one. + - cmd: | + curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py > ff_ci_pr_build.py + ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" + del ff_ci_pr_build.py + + # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + - cmd: rmdir C:\cygwin /s /q + + # Add path, activate `conda` and update conda. + - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat + - cmd: conda update --yes --quiet conda + + - cmd: set PYTHONUNBUFFERED=1 + + # Add our channels. + - cmd: conda config --set show_channel_urls true + - cmd: conda config --remove channels defaults + - cmd: conda config --add channels defaults + - cmd: conda config --add channels conda-forge + + # Configure the VM. + - cmd: conda install -n root --quiet --yes obvious-ci + - cmd: conda install -n root --quiet --yes conda-forge-build-setup + - cmd: run_conda_forge_build_setup + +# Skip .NET project specific build phase. +build: off + +test_script: + - "%CMD_IN_ENV% conda build recipe --quiet" +deploy_script: + - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main diff --git a/ci_support/fast_finish_ci_pr_build.sh b/ci_support/fast_finish_ci_pr_build.sh new file mode 100755 index 000000000..463c27fbe --- /dev/null +++ b/ci_support/fast_finish_ci_pr_build.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ + python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh new file mode 100755 index 000000000..e36cd5e2b --- /dev/null +++ b/ci_support/run_docker_build.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe + +docker info + +config=$(cat < ~/.condarc +# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. +conda clean --lock + +conda install --yes --quiet conda-forge-build-setup +source run_conda_forge_build_setup + +# Embarking on 1 case(s). + set -x + export CONDA_PY=35 + set +x + conda build /recipe_root --quiet || exit 1 + upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 +touch /feedstock_root/build_artefacts/conda-forge-build-done +EOF + +# double-check that the build got to the end +# see https://github.com/conda-forge/conda-smithy/pull/337 +# for a possible fix +set -x +test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1 diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..421809c18 --- /dev/null +++ b/circle.yml @@ -0,0 +1,19 @@ +checkout: + post: + - ./ci_support/fast_finish_ci_pr_build.sh + - ./ci_support/checkout_merge_commit.sh + +machine: + services: + - docker + +dependencies: + # Note, we used to use the naive caching of docker images, but found that it was quicker + # just to pull each time. #rollondockercaching + override: + - docker pull condaforge/linux-anvil + +test: + override: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + - ./ci_support/run_docker_build.sh diff --git a/recipe/LICENSE.txt b/recipe/LICENSE.txt index cba42cffc..7f5c36344 100644 --- a/recipe/LICENSE.txt +++ b/recipe/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2019, conda-forge +Copyright (c) 2015-2017, conda-forge All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From e88fbaeda25bbb95c7b81acc4b660e5099e0ca2f Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 24 Mar 2020 01:19:31 +0000 Subject: [PATCH 02/24] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration --- .github/workflows/webservices.yml | 2 +- conda-forge.yml | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index d6f06b5c9..2e5fe71fb 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@main + uses: conda-forge/webservices-dispatch-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/conda-forge.yml b/conda-forge.yml index 17384e1fb..1c09752dd 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,16 +1 @@ -build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: native} -test_on_native_only: true -bot: - abi_migration_branches: - - 3.7 - - 3.8 - - 3.9 -azure: - store_build_artifacts: true -github: - branch_name: main - tooling_branch_name: main -conda_build: - pkg_format: '2' From af7eefe84f7bd93bce61b6a7a74abd23b72b5e83 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 15 Nov 2022 01:02:45 +0000 Subject: [PATCH 03/24] Removed deprecated CMake functions --- recipe/tests/cmake/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/tests/cmake/CMakeLists.txt b/recipe/tests/cmake/CMakeLists.txt index 52c43d435..fa9741a3e 100644 --- a/recipe/tests/cmake/CMakeLists.txt +++ b/recipe/tests/cmake/CMakeLists.txt @@ -1,11 +1,9 @@ # https://martinopilia.com/posts/2018/09/15/building-python-extension.html +# FindPythonInterp and FindPythonLibs is deprecated since cmake 3.12 + cmake_minimum_required(VERSION 3.10) enable_language(C) project(mymath) option(PY_VER, "Python version to use") - -find_package(PythonInterp ${PY_VER} REQUIRED) -# PATHS $ENV{CONDA_PREFIX}) -# This goes after, since it uses PythonInterp as hint -find_package(PythonLibs ${PY_VER} REQUIRED) +find_package(Python ${PY_VER} REQUIRED) From fe8e27d94ad440e11171841b509f9da1b580c693 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Mon, 14 Nov 2022 21:08:43 -0500 Subject: [PATCH 04/24] Added debug and release variants --- recipe/build_base.sh | 3 ++- recipe/conda_build_config.yaml | 3 +++ recipe/meta.yaml | 6 +++--- recipe/run_test.py | 8 ++++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 7d53affa1..bea4c91f7 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -508,7 +508,8 @@ fi rm -rf ${PREFIX}/lib/python${VER}/distutils/command/*.exe python -c "import compileall,os;compileall.compile_dir(os.environ['PREFIX'])" -rm ${PREFIX}/lib/libpython${VER}.a +rm ${PREFIX}/lib/libpython${VERABI}.a + if [[ "$target_platform" == linux-* ]]; then rm ${PREFIX}/include/uuid.h fi diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9a00325a5..f098aa0ee 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -6,3 +6,6 @@ numpy: - 1.16 MACOSX_SDK_VERSION: # [osx and x86_64] - 11.0 # [osx and x86_64] +build_type: + - release + - debug diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b84616c69..219967f8d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,14 +26,14 @@ {% else %} {% set linkage_nature_env = 'static' %} {% endif %} -{% set dbg_abi = "" %} -{% set debug = os.environ.get('PY_INTERP_DEBUG', '') %} -{% if debug != '' and debug != 'no' %} +{% if build_type == "debug" %} {% set py_interp_debug = "yes" %} {% set debug = "_dbg" %} {% set dbg_abi = "d" %} # [win] {% else %} {% set py_interp_debug = "no" %} + {% set debug = "_dbg" %} + {% set dbg_abi = "" %} # [win] {% endif %} package: diff --git a/recipe/run_test.py b/recipe/run_test.py index f5d7f7cfa..3aa5ed751 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -93,10 +93,14 @@ import _tkinter print('TK_VERSION: %s' % _tkinter.TK_VERSION) print('TCL_VERSION: %s' % _tkinter.TCL_VERSION) - TCLTK_VER = os.getenv("tk") + TCLTK_VER = os.getenv('tk') assert _tkinter.TK_VERSION == _tkinter.TCL_VERSION == TCLTK_VER +if os.getenv('PY_INTERP_DEBUG') == 'yes': + assert 'd' in sys.abiflags + assert 'gettotalrefcount' in dir(sys) + import ssl print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION) -CONDA_OPENSSL_VERSION = os.getenv("openssl") +CONDA_OPENSSL_VERSION = os.getenv('openssl') assert CONDA_OPENSSL_VERSION in ssl.OPENSSL_VERSION From bdd2321dcda151389b65acc0a7a484a8022af20c Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 15 Nov 2022 01:30:14 -0500 Subject: [PATCH 05/24] corrected build_static directories --- recipe/build_static.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_static.sh b/recipe/build_static.sh index 2a1223f59..f57eb8b48 100644 --- a/recipe/build_static.sh +++ b/recipe/build_static.sh @@ -14,9 +14,9 @@ VERABI=${VER}${DBG} cp -pf ${_buildd_static}/libpython${VERABI}.a ${PREFIX}/lib/libpython${VERABI}.a if [[ ${HOST} =~ .*linux.* ]]; then - pushd ${PREFIX}/lib/python${VERABI}/config-${VERABI}-${HOST/-conda/} + pushd ${PREFIX}/lib/python${VER}/config-${VERABI}-${HOST/-conda/} elif [[ ${HOST} =~ .*darwin.* ]]; then - pushd ${PREFIX}/lib/python${VERABI}/config-${VERABI}-darwin + pushd ${PREFIX}/lib/python${VER}/config-${VERABI}-darwin fi ln -s ../../libpython${VERABI}.a libpython${VERABI}.a popd From b65653f702e1bbd7e712a6fc52f7bc9fe92f6a46 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 15 Nov 2022 01:33:32 -0500 Subject: [PATCH 06/24] Changed DEBUG_PY to PY_INTERP_DEBUG --- recipe/build_base.sh | 2 +- recipe/build_static.sh | 2 +- recipe/meta.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index bea4c91f7..5463242af 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -49,7 +49,7 @@ if [[ ${target_platform} == linux-ppc64le ]]; then fi declare -a _dbg_opts -if [[ ${DEBUG_PY} == yes ]]; then +if [[ ${PY_INTERP_DEBUG} == yes ]]; then # This Python will not be usable with non-debug Python modules. _dbg_opts+=(--with-pydebug) DBG=d diff --git a/recipe/build_static.sh b/recipe/build_static.sh index f57eb8b48..2e2fac46b 100644 --- a/recipe/build_static.sh +++ b/recipe/build_static.sh @@ -3,7 +3,7 @@ set -ex _buildd_static=build-static _buildd_shared=build-shared -if [[ ${DEBUG_PY} == yes ]]; then +if [[ ${PY_INTERP_DEBUG} == yes ]]; then DBG=d else DBG= diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 219967f8d..a1b091a14 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -269,6 +269,8 @@ outputs: activate_in_script: true ignore_run_exports: - python_abi + script_env: + - PY_INTERP_DEBUG={{ py_interp_debug }} string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ linkage_nature }}{{ debug }}_cpython # ["conda-forge" in (channel_targets or "")] string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ linkage_nature }}{{ debug }} # ["conda-forge" not in (channel_targets or "")] requirements: From 1ad7aae6c2137d151f2821f1474754489cc25569 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 15 Nov 2022 02:02:33 -0500 Subject: [PATCH 07/24] Corrected tests for libpython-static --- recipe/meta.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a1b091a14..11722ac32 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -290,9 +290,15 @@ outputs: requires: - {{ compiler('c') }} commands: - - test -f ${PREFIX}/lib/libpython${PKG_VERSION%.*}.a # [unix] - - test -f ${PREFIX}/lib/libpython${PKG_VERSION%.*}.nolto.a # [unix] - - test -f ${PREFIX}/lib/python${PKG_VERSION%.*}/config-${PKG_VERSION%.*}-darwin/libpython${PKG_VERSION%.*}.a # [osx] + - VER=${PKG_VERSION%.*} # [not win] +{% if py_interp_debug == "yes" %} + - VERABI=${VER}d # [not win] +{% else %} + - VERABI=${VER} # [not win] +{% endif %} + - test -f ${PREFIX}/lib/libpython${VERABI}.a # [unix] + - test -f ${PREFIX}/lib/libpython${VERABI}.nolto.a # [unix] + - test -f ${PREFIX}/lib/python${VER}/config-${VERABI}-darwin/libpython${VERABI}.a # [osx] - pushd tests/prefix-replacement # [unix] - bash build-and-test.sh # [unix] - popd # [unix] From 3726c332c52c79ece7a33a801f99bd68d387275e Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 15 Nov 2022 03:40:35 -0500 Subject: [PATCH 08/24] Skip testing abiflags on Windows --- recipe/run_test.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/run_test.py b/recipe/run_test.py index 3aa5ed751..bb0c8f0a1 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -86,6 +86,9 @@ import syslog import termios + if os.getenv('PY_INTERP_DEBUG') == 'yes': + assert 'd' in sys.abiflags + assert 'gettotalrefcount' in dir(sys) if not (armv6l or armv7l or ppc64le or osx105): import tkinter @@ -96,10 +99,6 @@ TCLTK_VER = os.getenv('tk') assert _tkinter.TK_VERSION == _tkinter.TCL_VERSION == TCLTK_VER -if os.getenv('PY_INTERP_DEBUG') == 'yes': - assert 'd' in sys.abiflags - assert 'gettotalrefcount' in dir(sys) - import ssl print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION) CONDA_OPENSSL_VERSION = os.getenv('openssl') From 175bdf168e91b8fc87a259746329e079407a0ff8 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 15 Nov 2022 11:53:45 -0500 Subject: [PATCH 09/24] Publish debug build under a separate label and skip windows debug builds Co-authored-by: Marcel Bargull --- recipe/conda_build_config.yaml | 6 ++++++ recipe/meta.yaml | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f098aa0ee..bb719aed0 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -9,3 +9,9 @@ MACOSX_SDK_VERSION: # [osx and x86_64] build_type: - release - debug +channel_targets: + - conda-forge main + - conda-forge python_debug +zip_keys: + - build_type + - channel_targets diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11722ac32..3bb8383f9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,11 +28,11 @@ {% endif %} {% if build_type == "debug" %} {% set py_interp_debug = "yes" %} - {% set debug = "_dbg" %} + {% set debug = "_debug" %} {% set dbg_abi = "d" %} # [win] {% else %} {% set py_interp_debug = "no" %} - {% set debug = "_dbg" %} + {% set debug = "" %} {% set dbg_abi = "" %} # [win] {% endif %} @@ -84,6 +84,7 @@ source: build: number: {{ build_number }} + skip: true # [win and build_type == "debug"] requirements: build: From 7556116f5e7994ed19baeef3a11ac7bb2780b85b Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Wed, 16 Nov 2022 03:12:10 -0500 Subject: [PATCH 10/24] Removed CircleCI from recipe --- recipe/.circleci/config.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 recipe/.circleci/config.yml diff --git a/recipe/.circleci/config.yml b/recipe/.circleci/config.yml deleted file mode 100644 index 6ad461b80..000000000 --- a/recipe/.circleci/config.yml +++ /dev/null @@ -1,24 +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 -*- - -version: 2 - -jobs: - build: - working_directory: ~/test - machine: true - steps: - - run: - # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. - command: exit 0 - -workflows: - version: 2 - build_and_test: - jobs: - - build: - filters: - branches: - ignore: - - /.*/ From 255c7bee95b32c5ff55fc284c313000cc990a6c0 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Fri, 18 Nov 2022 17:40:47 -0500 Subject: [PATCH 11/24] Bumped build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3bb8383f9..fe7c8d665 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' %} From 50fbe7b89e5f0049e1e95923df4559814f75a116 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Sat, 19 Nov 2022 08:53:45 -0500 Subject: [PATCH 12/24] symlink python binary and libpython to pythond --- recipe/build_base.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 5463242af..6f3d576c0 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -34,7 +34,7 @@ if [[ ${PY_INTERP_LINKAGE_NATURE} == shared ]]; then fi # For debugging builds, set this to no to disable profile-guided optimization -if [[ ${DEBUG_C} == yes ]]; then +if [[ ${PY_INTERP_DEBUG} == yes ]]; then _OPTIMIZED=no else _OPTIMIZED=yes @@ -510,6 +510,13 @@ rm -rf ${PREFIX}/lib/python${VER}/distutils/command/*.exe python -c "import compileall,os;compileall.compile_dir(os.environ['PREFIX'])" rm ${PREFIX}/lib/libpython${VERABI}.a +if [[ ${PY_INTERP_DEBUG} == yes ]]; then + rm ${PREFIX}/bin/python${VER} + ln -s ${PREFIX}/bin/python${VERABI} ${PREFIX}/bin/python${VER} + ln -s ${PREFIX}/lib/libpython${VERABI}.so ${PREFIX}/lib/libpython${VER}.so + ln -s ${PREFIX}/lib/libpython${VERABI}.so.1.0 ${PREFIX}/lib/libpython${VER}.so.1.0 +fi + if [[ "$target_platform" == linux-* ]]; then rm ${PREFIX}/include/uuid.h fi From c94878755beb46c546b65b91dcea265ae4d6ed32 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Sun, 20 Nov 2022 17:00:31 -0500 Subject: [PATCH 13/24] Disable compile time optimizations for debug build --- recipe/build_base.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 6f3d576c0..09ba02b05 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -97,6 +97,12 @@ if [[ ${_OPTIMIZED} = yes ]]; then CXXFLAGS=$(echo "${CXXFLAGS}" | sed "s/-O2/-O3/g") fi +if [[ ${PY_INTERP_DEBUG} == yes ]]; then + CPPFLAGS=$(echo "${CPPFLAGS}" | sed "s/-O2/-O0/g") + CFLAGS=$(echo "${CFLAGS}" | sed "s/-O2/-O0/g") + CXXFLAGS=$(echo "${CXXFLAGS}" | sed "s/-O2/-O0/g") +fi + if [[ ${CONDA_FORGE} == yes ]]; then ${SYS_PYTHON} ${RECIPE_DIR}/brand_python.py fi From fc82638e3df4cda7bd953d0dc78b1249be6ec021 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Mon, 21 Nov 2022 13:11:03 -0500 Subject: [PATCH 14/24] CI messes up windows debug builds Co-authored-by: Marcel Bargull --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fe7c8d665..04facccf2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -84,7 +84,7 @@ source: build: number: {{ build_number }} - skip: true # [win and build_type == "debug"] + skip: true # [win and build_type != "release"] requirements: build: From 1c8b515c80b3ef93a1fd3cd8861523549bc51425 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 22 Nov 2022 13:53:59 +0000 Subject: [PATCH 15/24] MNT: Re-rendered with conda-build 3.23.1, conda-smithy 3.22.0, and conda-forge-pinning 2022.11.22.12.08.38 --- .azure-pipelines/azure-pipelines-linux.yml | 49 ++------ .azure-pipelines/azure-pipelines-osx.yml | 51 ++------ .azure-pipelines/azure-pipelines-win.yml | 39 +----- ...conda-forge_python_debugopenssl1.1.1.yaml} | 30 ++--- ...getsconda-forge_python_debugopenssl3.yaml} | 30 ++--- ..._targetsconda-forge_mainopenssl1.1.1.yaml} | 22 +--- ...nnel_targetsconda-forge_mainopenssl3.yaml} | 22 +--- .ci_support/linux_aarch64_openssl1.1.1.yaml | 67 ----------- .ci_support/linux_aarch64_openssl3.yaml | 67 ----------- ...conda-forge_python_debugopenssl1.1.1.yaml} | 28 ++--- ...getsconda-forge_python_debugopenssl3.yaml} | 28 ++--- ..._targetsconda-forge_mainopenssl1.1.1.yaml} | 20 +--- ...nnel_targetsconda-forge_mainopenssl3.yaml} | 20 +--- ..._targetsconda-forge_mainopenssl1.1.1.yaml} | 23 ++-- ...nnel_targetsconda-forge_mainopenssl3.yaml} | 23 ++-- .circleci/config.yml | 2 +- .gitattributes | 22 ++++ .scripts/build_steps.sh | 7 +- .scripts/create_conda_build_artifacts.bat | 80 ------------- .scripts/create_conda_build_artifacts.sh | 113 ------------------ .scripts/run_osx_build.sh | 9 +- .travis.yml | 63 ---------- README.md | 103 ++++++---------- appveyor.yml | 64 ---------- ci_support/fast_finish_ci_pr_build.sh | 4 - ci_support/run_docker_build.sh | 59 --------- circle.yml | 19 --- 27 files changed, 168 insertions(+), 896 deletions(-) rename .ci_support/{linux_ppc64le_openssl1.1.1.yaml => linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml} (62%) rename .ci_support/{linux_ppc64le_openssl3.yaml => linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml} (62%) rename .ci_support/{linux_64_openssl1.1.1.yaml => linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml} (72%) rename .ci_support/{linux_64_openssl3.yaml => linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml} (72%) delete mode 100644 .ci_support/linux_aarch64_openssl1.1.1.yaml delete mode 100644 .ci_support/linux_aarch64_openssl3.yaml rename .ci_support/{osx_arm64_openssl1.1.1.yaml => osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml} (66%) rename .ci_support/{osx_arm64_openssl3.yaml => osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml} (66%) rename .ci_support/{osx_64_openssl1.1.1.yaml => osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml} (75%) rename .ci_support/{osx_64_openssl3.yaml => osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml} (75%) rename .ci_support/{win_64_openssl1.1.1.yaml => win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml} (62%) rename .ci_support/{win_64_openssl3.yaml => win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml} (62%) delete mode 100755 .scripts/create_conda_build_artifacts.bat delete mode 100755 .scripts/create_conda_build_artifacts.sh delete mode 100644 .travis.yml delete mode 100644 appveyor.yml delete mode 100755 ci_support/fast_finish_ci_pr_build.sh delete mode 100755 ci_support/run_docker_build.sh delete mode 100644 circle.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e2e7f4946..b502a93d2 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,22 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_openssl1.1.1: - CONFIG: linux_64_openssl1.1.1 + linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1: + CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_openssl1.1.1 - linux_64_openssl3: - CONFIG: linux_64_openssl3 + linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3: + CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1: + CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3: + CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_openssl3 timeoutInMinutes: 360 steps: @@ -48,33 +54,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=build_artifacts - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c66401c68..966570865 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,22 +8,18 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_openssl1.1.1: - CONFIG: osx_64_openssl1.1.1 + osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1: + CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_openssl1.1.1 - osx_64_openssl3: - CONFIG: osx_64_openssl3 + osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3: + CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_openssl3 - osx_arm64_openssl1.1.1: - CONFIG: osx_arm64_openssl1.1.1 + osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1: + CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_openssl1.1.1 - osx_arm64_openssl3: - CONFIG: osx_arm64_openssl3 + osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3: + CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_openssl3 timeoutInMinutes: 360 steps: @@ -43,33 +39,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6064ce299..fb09a213f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,12 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_openssl1.1.1: - CONFIG: win_64_openssl1.1.1 + win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1: + CONFIG: win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_openssl1.1.1 - win_64_openssl3: - CONFIG: win_64_openssl3 + win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3: + CONFIG: win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_openssl3 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -40,7 +38,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -68,33 +66,6 @@ jobs: displayName: Build recipe env: PYTHONUNBUFFERED: 1 - - script: | - 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() - - - 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) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml similarity index 62% rename from .ci_support/linux_ppc64le_openssl1.1.1.yaml rename to .ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml index c63c1ce62..b05bb79b7 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -1,3 +1,5 @@ +build_type: +- debug bzip2: - '1' c_compiler: @@ -5,17 +7,17 @@ c_compiler: c_compiler_version: - '10' cdt_name: -- cos7 +- cos6 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge python_debug cxx_compiler: - gxx cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: - '3.4' libuuid: @@ -25,23 +27,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -49,10 +37,14 @@ readline: sqlite: - '3' target_platform: -- linux-ppc64le +- linux-64 +tk: +- '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml similarity index 62% rename from .ci_support/linux_ppc64le_openssl3.yaml rename to .ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml index 4650156c2..c130f4ce0 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -1,3 +1,5 @@ +build_type: +- debug bzip2: - '1' c_compiler: @@ -5,17 +7,17 @@ c_compiler: c_compiler_version: - '10' cdt_name: -- cos7 +- cos6 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge python_debug cxx_compiler: - gxx cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: - '3.4' libuuid: @@ -25,23 +27,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -49,10 +37,14 @@ readline: sqlite: - '3' target_platform: -- linux-ppc64le +- linux-64 +tk: +- '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 72% rename from .ci_support/linux_64_openssl1.1.1.yaml rename to .ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index 0de656751..43bcf3823 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -1,3 +1,5 @@ +build_type: +- release bzip2: - '1' c_compiler: @@ -25,25 +27,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -55,8 +41,10 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml similarity index 72% rename from .ci_support/linux_64_openssl3.yaml rename to .ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 181f33b81..2e081c9d5 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -1,3 +1,5 @@ +build_type: +- release bzip2: - '1' c_compiler: @@ -25,25 +27,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -55,8 +41,10 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml deleted file mode 100644 index 51779afc5..000000000 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ /dev/null @@ -1,67 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -libffi: -- '3.4' -libuuid: -- '2' -ncurses: -- '6' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x - python: - min_pin: x.x - max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x -python: -- '3.11' -readline: -- '8' -sqlite: -- '3' -target_platform: -- linux-aarch64 -tk: -- '8.6' -xz: -- '5.2' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml deleted file mode 100644 index 53e3b515c..000000000 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ /dev/null @@ -1,67 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -libffi: -- '3.4' -libuuid: -- '2' -ncurses: -- '6' -openssl: -- '3' -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x - python: - min_pin: x.x - max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x -python: -- '3.11' -readline: -- '8' -sqlite: -- '3' -target_platform: -- linux-aarch64 -tk: -- '8.6' -xz: -- '5.2' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/osx_arm64_openssl1.1.1.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml similarity index 66% rename from .ci_support/osx_arm64_openssl1.1.1.yaml rename to .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml index 2f40f85eb..429557082 100644 --- a/.ci_support/osx_arm64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: - '11.0' +build_type: +- debug bzip2: - '1' c_compiler: @@ -9,7 +13,7 @@ c_compiler_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge python_debug cxx_compiler: - clangxx cxx_compiler_version: @@ -17,29 +21,15 @@ cxx_compiler_version: libffi: - '3.4' macos_machine: -- arm64-apple-darwin20.0.0 +- x86_64-apple-darwin13.4.0 ncurses: - '6' openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -47,12 +37,14 @@ readline: sqlite: - '3' target_platform: -- osx-arm64 +- osx-64 tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/osx_arm64_openssl3.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml similarity index 66% rename from .ci_support/osx_arm64_openssl3.yaml rename to .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml index 7e6939bd0..1d50f1cab 100644 --- a/.ci_support/osx_arm64_openssl3.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: - '11.0' +build_type: +- debug bzip2: - '1' c_compiler: @@ -9,7 +13,7 @@ c_compiler_version: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge python_debug cxx_compiler: - clangxx cxx_compiler_version: @@ -17,29 +21,15 @@ cxx_compiler_version: libffi: - '3.4' macos_machine: -- arm64-apple-darwin20.0.0 +- x86_64-apple-darwin13.4.0 ncurses: - '6' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -47,12 +37,14 @@ readline: sqlite: - '3' target_platform: -- osx-arm64 +- osx-64 tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 75% rename from .ci_support/osx_64_openssl1.1.1.yaml rename to .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index bfb796d36..73b508557 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: - '11.0' +build_type: +- release bzip2: - '1' c_compiler: @@ -25,23 +27,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -53,8 +41,10 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml similarity index 75% rename from .ci_support/osx_64_openssl3.yaml rename to .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index cd767ce39..fd1f03ed7 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: - '11.0' +build_type: +- release bzip2: - '1' c_compiler: @@ -25,23 +27,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -53,8 +41,10 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: +- - build_type + - channel_targets - - c_compiler_version - cxx_compiler_version zlib: diff --git a/.ci_support/win_64_openssl1.1.1.yaml b/.ci_support/win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 62% rename from .ci_support/win_64_openssl1.1.1.yaml rename to .ci_support/win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml index bac103486..2ad067a2c 100644 --- a/.ci_support/win_64_openssl1.1.1.yaml +++ b/.ci_support/win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -1,33 +1,23 @@ +build_type: +- debug bzip2: - '1' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 libffi: - '3.4' openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' sqlite: @@ -37,6 +27,9 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' +zip_keys: +- - build_type + - channel_targets zlib: - '1.2' diff --git a/.ci_support/win_64_openssl3.yaml b/.ci_support/win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml similarity index 62% rename from .ci_support/win_64_openssl3.yaml rename to .ci_support/win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml index 12fd79358..798dbb046 100644 --- a/.ci_support/win_64_openssl3.yaml +++ b/.ci_support/win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml @@ -1,33 +1,23 @@ +build_type: +- debug bzip2: - '1' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 libffi: - '3.4' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' sqlite: @@ -37,6 +27,9 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' +zip_keys: +- - build_type + - channel_targets zlib: - '1.2' diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa24d..8b4ef2f99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # 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 -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.gitattributes b/.gitattributes index 288029dca..7f3276384 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,27 @@ * text=auto +*.patch binary +*.diff binary meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf + +# github helper pieces to make some files not show up in diffs automatically +.azure-pipelines/* linguist-generated=true +.circleci/* linguist-generated=true +.ci_support/README linguist-generated=true +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +.scripts/* linguist-generated=true +.woodpecker.yml linguist-generated=true +LICENSE.txt linguist-generated=true +README.md linguist-generated=true +azure-pipelines.yml linguist-generated=true +build-locally.py linguist-generated=true +shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index b4367e4fd..9a0749400 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -53,9 +53,6 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi ( endgroup "Configuring conda" ) 2> /dev/null diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat deleted file mode 100755 index 79ce625d8..000000000 --- a/.scripts/create_conda_build_artifacts.bat +++ /dev/null @@ -1,80 +0,0 @@ -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_DIR (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_DIR% ( - 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 Set a descriptive ID for the archive(s), specialized for this particular job run -set ARCHIVE_UNIQUE_ID=%CI_RUN_ID%_%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_DIR%" -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 ::set-output name=BLD_ARTIFACT_NAME::!BLD_ARTIFACT_NAME! - echo ::set-output name=BLD_ARTIFACT_PATH::!BLD_ARTIFACT_PATH! - ) -) - -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_DIR%"/_*_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 ::set-output name=ENV_ARTIFACT_NAME::!ENV_ARTIFACT_NAME! - echo ::set-output name=ENV_ARTIFACT_PATH::!ENV_ARTIFACT_PATH! - ) -) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh deleted file mode 100755 index cba0faeea..000000000 --- a/.scripts/create_conda_build_artifacts.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/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_DIR (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_DIR" ]; 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_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then - pushd "$CONDA_BLD_DIR" - 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 "::set-output name=BLD_ARTIFACT_NAME::$BLD_ARTIFACT_NAME" - echo "::set-output name=BLD_ARTIFACT_PATH::$BLD_ARTIFACT_PATH" - 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_DIR"/'_*_env*/' -bb; then - pushd "$CONDA_BLD_DIR" - 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 "::set-output name=ENV_ARTIFACT_NAME::$ENV_ARTIFACT_NAME" - echo "::set-output name=ENV_ARTIFACT_PATH::$ENV_ARTIFACT_PATH" - fi -fi \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a09..caa788e64 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" @@ -56,10 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f3c54f35c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,63 +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. - -language: generic - -os: osx -osx_image: xcode6.4 - -env: - matrix: - - - CONDA_PY=35 - global: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - - secure: "nkZ1RWSP1PIRI6OqCwqeLrib7nXeBzX7PJg+P72RH1LQ56SZCdzqmvr3IoC2gxayZBzDnFsq7bU1ypy/gNtKDfWaXJvUQVKcKrbWF6dQxVXP/X5go+y9stSjI/WGXMbBr8ZwePR3lDmEPifEKdpgOaMWosqnK+ThtRNdxqKbnzRB6cOJSCcRGIMexauJg+IkPyQ5MFh59VHLdvfxfqNXa1Kdv2WkgfKX+apjLlCJoDP34zUcGFyIccbbq130AW0aYiJV3ZJIIVfcAgJqS7Ons0X3biA7/Fp6AWQKx91Ew/aoN3xb878CVr5ygKqjDdVkZClW2JEaSW9w+WG7RWomPJIPvmAuoKg50S4D07iBZf89Hjg+oybZ17ct+OA1UdW8EK8c/gaPFQsBuN1sRG2DNAJug+ViPPl7hnoAfRhRcPnUEuLcPJ6kyEcpYZgPE3MMRtjIiRRyNRzccinjxjPbojFTkiCHM9U9krFVGwIKNHp6623rttriu9YGU7yd6wRGbD09AUajT8r9iPn2OJ1+ibzCIbzJx6Nb7290+Fs4UbU29m1bAiabBTnN6EVim20tMtqCxA6HNbji30SBB/C+lQ/pf9D16Nxy+FCEdQXb193iqBxhjzEpJZHkFY/g8b1C6yJGi6dzbNDKT63HbGduQUZ99rKMmI8XaAf3ANRm/Vs=" - - -before_install: - # Fast finish the PR. - - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ - python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 - - # Remove homebrew. - - | - echo "" - echo "Removing homebrew from Travis CI to avoid conflicts." - curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew - chmod +x ~/uninstall_homebrew - ~/uninstall_homebrew -fq - rm ~/uninstall_homebrew - - -install: - # Install Miniconda. - - | - echo "" - echo "Installing a fresh version of Miniconda." - MINICONDA_URL="https://repo.continuum.io/miniconda" - MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" - curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" - bash $MINICONDA_FILE -b - - # Configure conda. - - | - echo "" - echo "Configuring conda." - source /Users/travis/miniconda3/bin/activate root - conda config --remove channels defaults - conda config --add channels defaults - conda config --add channels conda-forge - conda config --set show_channel_urls true - conda install --yes --quiet conda-forge-build-setup - source run_conda_forge_build_setup - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 2a0b18dea..4a24d416f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://www.python.org/ Package license: Python-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/master/LICENSE.txt) Summary: General purpose programming language @@ -25,108 +25,87 @@ Current build status ==================== - - - - +
Travis - - linux - -
Azure
- - + + - - - - + - + - + - + - + - + - + - + - + - + - - - @@ -145,18 +124,6 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libpython--static-green.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libpython-static.svg)](https://anaconda.org/conda-forge/libpython-static) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python-green.svg)](https://anaconda.org/conda-forge/python) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python.svg)](https://anaconda.org/conda-forge/python) | -Current build status -==================== - -Linux: [![Circle CI](https://circleci.com/gh/conda-forge/python-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/python-feedstock) -OSX: [![TravisCI](https://travis-ci.org/conda-forge/python-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/python-feedstock) -Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/python-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/python-feedstock/branch/master) - -Current release info -==================== -Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python/badges/version.svg)](https://anaconda.org/conda-forge/python) -Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/python/badges/downloads.svg)](https://anaconda.org/conda-forge/python) - Installing python ================= @@ -204,6 +171,7 @@ mamba repoquery whoneeds libpython-static --channel conda-forge mamba repoquery depends libpython-static --channel conda-forge ``` + About conda-forge ================= @@ -270,6 +238,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@chrisburr](https://github.com/chrisburr/) * [@isuruf](https://github.com/isuruf/) * [@jakirkham](https://github.com/jakirkham/) * [@katietz](https://github.com/katietz/) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 5e49ab112..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,64 +0,0 @@ -# This file was automatically generated by conda-smithy. To update a component of this -# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run -# "conda smithy rerender". - -environment: - - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd" - - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: MP4hZYylDyUWEsrt3u3cod2sbFeRwUziH02mvQOdbjsTO/l1yIxDkP/76rSIjcGC - - matrix: - - TARGET_ARCH: x86 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35 - - - TARGET_ARCH: x64 - CONDA_PY: 35 - CONDA_INSTALL_LOCN: C:\\Miniconda35-x64 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -install: - # If there is a newer build queued for the same PR, cancel this one. - - cmd: | - curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py > ff_ci_pr_build.py - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" - del ff_ci_pr_build.py - - # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda update --yes --quiet conda - - - cmd: set PYTHONUNBUFFERED=1 - - # Add our channels. - - cmd: conda config --set show_channel_urls true - - cmd: conda config --remove channels defaults - - cmd: conda config --add channels defaults - - cmd: conda config --add channels conda-forge - - # Configure the VM. - - cmd: conda install -n root --quiet --yes obvious-ci - - cmd: conda install -n root --quiet --yes conda-forge-build-setup - - cmd: run_conda_forge_build_setup - -# Skip .NET project specific build phase. -build: off - -test_script: - - "%CMD_IN_ENV% conda build recipe --quiet" -deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main diff --git a/ci_support/fast_finish_ci_pr_build.sh b/ci_support/fast_finish_ci_pr_build.sh deleted file mode 100755 index 463c27fbe..000000000 --- a/ci_support/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/ci_support/run_docker_build.sh b/ci_support/run_docker_build.sh deleted file mode 100755 index e36cd5e2b..000000000 --- a/ci_support/run_docker_build.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe - -docker info - -config=$(cat < ~/.condarc -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts. -conda clean --lock - -conda install --yes --quiet conda-forge-build-setup -source run_conda_forge_build_setup - -# Embarking on 1 case(s). - set -x - export CONDA_PY=35 - set +x - conda build /recipe_root --quiet || exit 1 - upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1 -touch /feedstock_root/build_artefacts/conda-forge-build-done -EOF - -# double-check that the build got to the end -# see https://github.com/conda-forge/conda-smithy/pull/337 -# for a possible fix -set -x -test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1 diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 421809c18..000000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -checkout: - post: - - ./ci_support/fast_finish_ci_pr_build.sh - - ./ci_support/checkout_merge_commit.sh - -machine: - services: - - docker - -dependencies: - # Note, we used to use the naive caching of docker images, but found that it was quicker - # just to pull each time. #rollondockercaching - override: - - docker pull condaforge/linux-anvil - -test: - override: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - - ./ci_support/run_docker_build.sh From e427eb58d262f47a4fc2141243e7d2680f1aa757 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 22 Nov 2022 09:02:21 -0500 Subject: [PATCH 16/24] Restored conda-forge.yml Probably got messed up while rebasing --- conda-forge.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 1c09752dd..17384e1fb 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1 +1,16 @@ +build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true +provider: {linux_aarch64: default, linux_ppc64le: native} +test_on_native_only: true +bot: + abi_migration_branches: + - 3.7 + - 3.8 + - 3.9 +azure: + store_build_artifacts: true +github: + branch_name: main + tooling_branch_name: main +conda_build: + pkg_format: '2' From 72364f044c27d30450192014322d29d484eb92ab Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 22 Nov 2022 14:06:35 +0000 Subject: [PATCH 17/24] MNT: Re-rendered with conda-build 3.23.1, conda-smithy 3.22.0, and conda-forge-pinning 2022.11.22.12.08.38 --- .azure-pipelines/azure-pipelines-linux.yml | 35 ++++- .azure-pipelines/azure-pipelines-osx.yml | 51 ++++++- .azure-pipelines/azure-pipelines-win.yml | 29 ++++ ...sconda-forge_python_debugopenssl1.1.1.yaml | 55 +++++++ ...rgetsconda-forge_python_debugopenssl3.yaml | 55 +++++++ ...l_targetsconda-forge_mainopenssl1.1.1.yaml | 55 +++++++ ...annel_targetsconda-forge_mainopenssl3.yaml | 55 +++++++ ...sconda-forge_python_debugopenssl1.1.1.yaml | 49 ++++++ ...rgetsconda-forge_python_debugopenssl3.yaml | 49 ++++++ ...l_targetsconda-forge_mainopenssl1.1.1.yaml | 49 ++++++ ...annel_targetsconda-forge_mainopenssl3.yaml | 49 ++++++ ...sconda-forge_python_debugopenssl1.1.1.yaml | 49 ++++++ ...rgetsconda-forge_python_debugopenssl3.yaml | 49 ++++++ ...l_targetsconda-forge_mainopenssl1.1.1.yaml | 49 ++++++ ...annel_targetsconda-forge_mainopenssl3.yaml | 49 ++++++ .scripts/build_steps.sh | 3 + .scripts/create_conda_build_artifacts.bat | 80 ++++++++++ .scripts/create_conda_build_artifacts.sh | 113 ++++++++++++++ .scripts/run_osx_build.sh | 4 + .travis.yml | 57 +++++++ README.md | 139 +++++++++++++++--- 21 files changed, 1097 insertions(+), 26 deletions(-) create mode 100644 .ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml create mode 100644 .ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml create mode 100644 .ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml create mode 100644 .ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml create mode 100644 .ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml create mode 100644 .ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml create mode 100644 .ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml create mode 100644 .ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml create mode 100644 .ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml create mode 100644 .ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml create mode 100644 .ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml create mode 100644 .ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml create mode 100755 .scripts/create_conda_build_artifacts.bat create mode 100755 .scripts/create_conda_build_artifacts.sh create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b502a93d2..c8b510496 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,18 +12,22 @@ jobs: CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_build_typedebugchannel_tar_hcda62207c0 linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3: CONFIG: linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_build_typedebugchannel_tar_h30c384a389 linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1: CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_build_typereleasechannel_t_h1b30d0c4c1 linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3: CONFIG: linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_build_typereleasechannel_t_h8be0192cab timeoutInMinutes: 360 steps: @@ -54,4 +58,33 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export CONDA_BLD_DIR=build_artifacts + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_DIR except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_DIR environments only when the job fails + export ENV_ARTIFACT_PREFIX=conda_envs + fi + ./.scripts/create_conda_build_artifacts.sh + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 966570865..fc93eb5d0 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,15 +11,35 @@ jobs: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1: CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_build_typedebugchannel_targe_h53db747388 osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3: CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_build_typedebugchannel_targe_h6f2b7213c3 osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1: CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_build_typereleasechannel_tar_h97238b3e09 osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3: CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_build_typereleasechannel_tar_h16248986ae + osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1: + CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_build_typedebugchannel_ta_h07aab89ef4 + osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3: + CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_build_typedebugchannel_ta_h73717dc4ce + osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1: + CONFIG: osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_build_typereleasechannel__h4d9aff7ee9 + osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3: + CONFIG: osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_build_typereleasechannel__h92ebfec36c timeoutInMinutes: 360 steps: @@ -39,4 +59,33 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_DIR except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_DIR environments only when the job fails + export ENV_ARTIFACT_PREFIX=conda_envs + fi + ./.scripts/create_conda_build_artifacts.sh + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index fb09a213f..411736294 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,11 @@ jobs: win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1: CONFIG: win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_build_typedebugchannel_targe_h2b86c86fd2 win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3: CONFIG: win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_build_typedebugchannel_targe_h64a7865dd2 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -66,6 +68,33 @@ jobs: displayName: Build recipe env: PYTHONUNBUFFERED: 1 + - script: | + 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() + + - 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) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml new file mode 100644 index 000000000..8e20db4fd --- /dev/null +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -0,0 +1,55 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_type: +- debug +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml new file mode 100644 index 000000000..8e5a7c8a0 --- /dev/null +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -0,0 +1,55 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_type: +- debug +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml new file mode 100644 index 000000000..ba201f3e8 --- /dev/null +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -0,0 +1,55 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_type: +- release +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml new file mode 100644 index 000000000..90d2df8bd --- /dev/null +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -0,0 +1,55 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_type: +- release +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml new file mode 100644 index 000000000..65ccdedbf --- /dev/null +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -0,0 +1,49 @@ +build_type: +- debug +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml new file mode 100644 index 000000000..457e3686b --- /dev/null +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -0,0 +1,49 @@ +build_type: +- debug +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml new file mode 100644 index 000000000..71dd1b79e --- /dev/null +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -0,0 +1,49 @@ +build_type: +- release +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml new file mode 100644 index 000000000..46ae73795 --- /dev/null +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -0,0 +1,49 @@ +build_type: +- release +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libffi: +- '3.4' +libuuid: +- '2' +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml new file mode 100644 index 000000000..b46175e5c --- /dev/null +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -0,0 +1,49 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +build_type: +- debug +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +libffi: +- '3.4' +macos_machine: +- arm64-apple-darwin20.0.0 +ncurses: +- '6' +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-arm64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml new file mode 100644 index 000000000..96aa216aa --- /dev/null +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -0,0 +1,49 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +build_type: +- debug +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +libffi: +- '3.4' +macos_machine: +- arm64-apple-darwin20.0.0 +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-arm64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml new file mode 100644 index 000000000..d5acd3685 --- /dev/null +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -0,0 +1,49 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +build_type: +- release +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +libffi: +- '3.4' +macos_machine: +- arm64-apple-darwin20.0.0 +ncurses: +- '6' +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-arm64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml new file mode 100644 index 000000000..22a514744 --- /dev/null +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -0,0 +1,49 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +build_type: +- release +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +libffi: +- '3.4' +macos_machine: +- arm64-apple-darwin20.0.0 +ncurses: +- '6' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.11' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-arm64 +tk: +- '8.6' +xz: +- '5' +zip_keys: +- - build_type + - channel_targets +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9a0749400..bf8c78c27 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -53,6 +53,9 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi ( endgroup "Configuring conda" ) 2> /dev/null diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat new file mode 100755 index 000000000..79ce625d8 --- /dev/null +++ b/.scripts/create_conda_build_artifacts.bat @@ -0,0 +1,80 @@ +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_DIR (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_DIR% ( + 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 Set a descriptive ID for the archive(s), specialized for this particular job run +set ARCHIVE_UNIQUE_ID=%CI_RUN_ID%_%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_DIR%" -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 ::set-output name=BLD_ARTIFACT_NAME::!BLD_ARTIFACT_NAME! + echo ::set-output name=BLD_ARTIFACT_PATH::!BLD_ARTIFACT_PATH! + ) +) + +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_DIR%"/_*_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 ::set-output name=ENV_ARTIFACT_NAME::!ENV_ARTIFACT_NAME! + echo ::set-output name=ENV_ARTIFACT_PATH::!ENV_ARTIFACT_PATH! + ) +) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh new file mode 100755 index 000000000..cba0faeea --- /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_DIR (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_DIR" ]; 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_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then + pushd "$CONDA_BLD_DIR" + 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 "::set-output name=BLD_ARTIFACT_NAME::$BLD_ARTIFACT_NAME" + echo "::set-output name=BLD_ARTIFACT_PATH::$BLD_ARTIFACT_PATH" + 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_DIR"/'_*_env*/' -bb; then + pushd "$CONDA_BLD_DIR" + 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 "::set-output name=ENV_ARTIFACT_NAME::$ENV_ARTIFACT_NAME" + echo "::set-output name=ENV_ARTIFACT_PATH::$ENV_ARTIFACT_PATH" + fi +fi \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e64..b3abaeb54 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,6 +55,10 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..46bba9863 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,57 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 4a24d416f..f39cdbd02 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://www.python.org/ Package license: Python-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/main/LICENSE.txt) Summary: General purpose programming language @@ -25,15 +25,22 @@ Current build status ==================== -
VariantStatus
linux_64_openssl1.1.1 - - variant - -
linux_64_openssl3linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - - variant + + variant
linux_aarch64_openssl1.1.1linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - - variant + + variant
linux_aarch64_openssl3linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - - variant + + variant
linux_ppc64le_openssl1.1.1linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 - - variant + + variant
linux_ppc64le_openssl3osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - - variant + + variant
osx_64_openssl1.1.1osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - - variant + + variant
osx_64_openssl3osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - - variant + + variant
osx_arm64_openssl1.1.1osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 - - variant + + variant
osx_arm64_openssl3win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 - - variant + + variant
win_64_openssl1.1.1win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 - - variant - -
win_64_openssl3 - - variant + + variant
+
+ + +
Travis + + linux + +
Azure
- - + + @@ -41,71 +48,155 @@ Current build status + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f8f8c06dfe62b22a8daee04b04da98dd6cd17c4d Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 22 Nov 2022 13:39:47 -0500 Subject: [PATCH 18/24] set dbg_abi to empty string in meta.yaml --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04facccf2..ae1d55841 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,14 +26,13 @@ {% else %} {% set linkage_nature_env = 'static' %} {% endif %} +{% set dbg_abi = "" %} {% if build_type == "debug" %} {% set py_interp_debug = "yes" %} {% set debug = "_debug" %} - {% set dbg_abi = "d" %} # [win] {% else %} {% set py_interp_debug = "no" %} {% set debug = "" %} - {% set dbg_abi = "" %} # [win] {% endif %} package: From 0b1d7acdd6c51c344feede8cb95ef7692eb79450 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 22 Nov 2022 13:45:45 -0500 Subject: [PATCH 19/24] FindPythonInterp and FindPythonLibs are still used by other projects --- recipe/tests/cmake/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe/tests/cmake/CMakeLists.txt b/recipe/tests/cmake/CMakeLists.txt index fa9741a3e..a13e20ae1 100644 --- a/recipe/tests/cmake/CMakeLists.txt +++ b/recipe/tests/cmake/CMakeLists.txt @@ -1,9 +1,16 @@ # https://martinopilia.com/posts/2018/09/15/building-python-extension.html -# FindPythonInterp and FindPythonLibs is deprecated since cmake 3.12 +# FindPythonInterp and FindPythonLibs are deprecated since cmake 3.12 +# These can be replaced by find_package(Python ${PY_VER} REQUIRED) +# But these are still used by other packages, so we keep them. cmake_minimum_required(VERSION 3.10) enable_language(C) project(mymath) option(PY_VER, "Python version to use") -find_package(Python ${PY_VER} REQUIRED) + +find_package(PythonInterp ${PY_VER} REQUIRED) +# PATHS $ENV{CONDA_PREFIX} + +# This goes after, since it uses PythonInterp as hint +find_package(PythonLibs ${PY_VER} REQUIRED) From 3ef8520d8cfa865cce5604c8e4c84085cb49ba80 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 22 Nov 2022 14:09:24 -0500 Subject: [PATCH 20/24] Check gettotalrefcount on all platforms --- recipe/run_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/run_test.py b/recipe/run_test.py index bb0c8f0a1..6529b7e5a 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -86,9 +86,10 @@ import syslog import termios - if os.getenv('PY_INTERP_DEBUG') == 'yes': +if os.getenv('PY_INTERP_DEBUG') == 'yes': + if sys.platform != 'win32': assert 'd' in sys.abiflags - assert 'gettotalrefcount' in dir(sys) + assert 'gettotalrefcount' in dir(sys) if not (armv6l or armv7l or ppc64le or osx105): import tkinter From e96ec504bec3114fd91cecc7e2dc11937a1c5927 Mon Sep 17 00:00:00 2001 From: Nikhil Verma Date: Tue, 22 Nov 2022 16:01:20 -0500 Subject: [PATCH 21/24] Add run_exports for debug builds --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ae1d55841..28d1d8d68 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -128,6 +128,9 @@ outputs: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ linkage_nature }}{{ debug }} # ["conda-forge" not in (channel_targets or "")] {% if 'conda-forge' in channel_targets %} run_exports: +{% if py_interp_debug == "yes" %} + - python=*=*debug* +{% endif %} noarch: - python weak: From 3719383bb22d2f90d11e5ffe1cd1a6e6374e0d8a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 22 Nov 2022 16:18:49 -0600 Subject: [PATCH 22/24] Fix includes --- recipe/build_base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 09ba02b05..d315a0a8a 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -520,7 +520,7 @@ if [[ ${PY_INTERP_DEBUG} == yes ]]; then rm ${PREFIX}/bin/python${VER} ln -s ${PREFIX}/bin/python${VERABI} ${PREFIX}/bin/python${VER} ln -s ${PREFIX}/lib/libpython${VERABI}.so ${PREFIX}/lib/libpython${VER}.so - ln -s ${PREFIX}/lib/libpython${VERABI}.so.1.0 ${PREFIX}/lib/libpython${VER}.so.1.0 + ln -s ${PREFIX}/include/python${VERABI} ${PREFIX}/include/python${VER} fi if [[ "$target_platform" == linux-* ]]; then From 33a229df99174bb7826bc0d3570223d73848eb69 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 22 Nov 2022 16:20:10 -0600 Subject: [PATCH 23/24] Fix run_exports --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 28d1d8d68..e2e298cc3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -128,13 +128,13 @@ outputs: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ linkage_nature }}{{ debug }} # ["conda-forge" not in (channel_targets or "")] {% if 'conda-forge' in channel_targets %} run_exports: -{% if py_interp_debug == "yes" %} - - python=*=*debug* -{% endif %} noarch: - python weak: - python_abi {{ ver2 }}.* *_cp{{ ver2nd }} +{% if py_interp_debug == "yes" %} + - python {{ ver2 }}.* *_debug_cpython +{% endif %} {% endif %} script_env: - PY_INTERP_LINKAGE_NATURE={{ linkage_nature_env }} From 2db6225e46f04c852babf471506fa891cf6f0cad Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 04:28:29 +0000 Subject: [PATCH 24/24] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2022.12.07.18.34.25 --- .azure-pipelines/azure-pipelines-osx.yml | 24 +++++++++---------- .azure-pipelines/azure-pipelines-win.yml | 4 ++++ ...sconda-forge_python_debugopenssl1.1.1.yaml | 4 ++-- ...rgetsconda-forge_python_debugopenssl3.yaml | 4 ++-- ...l_targetsconda-forge_mainopenssl1.1.1.yaml | 4 ++-- ...annel_targetsconda-forge_mainopenssl3.yaml | 4 ++-- ...sconda-forge_python_debugopenssl1.1.1.yaml | 4 ++-- ...rgetsconda-forge_python_debugopenssl3.yaml | 4 ++-- ...l_targetsconda-forge_mainopenssl1.1.1.yaml | 4 ++-- ...annel_targetsconda-forge_mainopenssl3.yaml | 4 ++-- ...sconda-forge_python_debugopenssl1.1.1.yaml | 4 ++-- ...rgetsconda-forge_python_debugopenssl3.yaml | 4 ++-- ...l_targetsconda-forge_mainopenssl1.1.1.yaml | 4 ++-- ...annel_targetsconda-forge_mainopenssl3.yaml | 4 ++-- ..._targetsconda-forge_mainopenssl1.1.1.yaml} | 2 +- ...nnel_targetsconda-forge_mainopenssl3.yaml} | 2 +- ...conda-forge_python_debugopenssl1.1.1.yaml} | 2 +- ...getsconda-forge_python_debugopenssl3.yaml} | 2 +- README.md | 16 ++++++------- 19 files changed, 52 insertions(+), 48 deletions(-) rename .ci_support/{osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml => osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml} (98%) rename .ci_support/{osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml => osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml} (98%) rename .ci_support/{osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml => osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml} (98%) rename .ci_support/{osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml => osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index fc93eb5d0..368f561b7 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,22 +8,22 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1: - CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 + osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1: + CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_build_typedebugchannel_targe_h53db747388 - osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3: - CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 + SHORT_CONFIG: osx_64_build_typedebugchannel_targe_he9bb30c0b5 + osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3: + CONFIG: osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_build_typedebugchannel_targe_h6f2b7213c3 - osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1: - CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 + SHORT_CONFIG: osx_64_build_typedebugchannel_targe_hd0cdfef905 + osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1: + CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_build_typereleasechannel_tar_h97238b3e09 - osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3: - CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 + SHORT_CONFIG: osx_64_build_typereleasechannel_tar_h718e08571b + osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3: + CONFIG: osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_build_typereleasechannel_tar_h16248986ae + SHORT_CONFIG: osx_64_build_typereleasechannel_tar_h6d9d0bb8cf osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1: CONFIG: osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 411736294..98eb6e1d8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -19,6 +19,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -104,6 +105,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml index b05bb79b7..a384bb617 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml index c130f4ce0..5e08c3994 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index 43bcf3823..1fff0061f 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 2e081c9d5..9e6621492 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml index 8e20db4fd..833d19825 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml index 8e5a7c8a0..ebf1f8bfc 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index ba201f3e8..3c1cb37bb 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 90d2df8bd..4bc4497fe 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml index 65ccdedbf..a944a33cf 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml index 457e3686b..b97e45252 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index 71dd1b79e..8d8e4f7cc 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 46ae73795..f8e7f0b84 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 98% rename from .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml rename to .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml index 73b508557..bc387620e 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' build_type: -- release +- debug bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml similarity index 98% rename from .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml rename to .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml index fd1f03ed7..0df1e47f4 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' build_type: -- release +- debug bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml similarity index 98% rename from .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml rename to .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml index 429557082..9a5e3bdaa 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' build_type: -- debug +- release bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml similarity index 98% rename from .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml rename to .ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml index 1d50f1cab..325ec0153 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' build_type: -- debug +- release bzip2: - '1' c_compiler: diff --git a/README.md b/README.md index f39cdbd02..e1adb7d15 100644 --- a/README.md +++ b/README.md @@ -130,31 +130,31 @@ Current build status - + - + - + - +
linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - - variant + + variant
linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - - variant + + variant
linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - - variant + + variant
linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 - - variant + + variant + +
linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 + + variant + +
linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 + + variant + +
linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 + + variant + +
linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3 + + variant + +
linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 + + variant + +
linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 + + variant + +
linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 + + variant + +
linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3 + + variant
osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - - variant + + variant
osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - - variant + + variant
osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - - variant + + variant
osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 - - variant + + variant + +
osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 + + variant + +
osx_arm64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 + + variant + +
osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 + + variant + +
osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3 + + variant
win_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 - - variant + + variant
win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 - - variant + + variant
osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 - variant + variant
osx_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 - variant + variant
osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1 - variant + variant
osx_64_build_typereleasechannel_targetsconda-forge_mainopenssl3osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3 - variant + variant