diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e2e7f4946..c8b510496 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,26 @@ 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 + 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_openssl3 + 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: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c66401c68..368f561b7 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,22 +8,38 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_openssl1.1.1: - CONFIG: osx_64_openssl1.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_openssl1.1.1 - osx_64_openssl3: - CONFIG: osx_64_openssl3 + 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_openssl3 - osx_arm64_openssl1.1.1: - CONFIG: osx_arm64_openssl1.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_arm64_openssl1.1.1 - osx_arm64_openssl3: - CONFIG: osx_arm64_openssl3 + 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_arm64_openssl3 + 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' + 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: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6064ce299..98eb6e1d8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,18 @@ 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 + 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_openssl3 + SHORT_CONFIG: win_64_build_typedebugchannel_targe_h64a7865dd2 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -40,7 +41,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 @@ -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 new file mode 100644 index 000000000..a384bb617 --- /dev/null +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -0,0 +1,51 @@ +build_type: +- debug +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +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-64 +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_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml new file mode 100644 index 000000000..5e08c3994 --- /dev/null +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3.yaml @@ -0,0 +1,51 @@ +build_type: +- debug +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +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-64 +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_64_openssl1.1.1.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 70% 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..1fff0061f 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -1,9 +1,11 @@ +build_type: +- release bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -13,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: @@ -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 70% rename from .ci_support/linux_64_openssl3.yaml rename to .ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 181f33b81..9e6621492 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -1,9 +1,11 @@ +build_type: +- release bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -13,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: @@ -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_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..833d19825 --- /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: +- '11' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +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..ebf1f8bfc --- /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: +- '11' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +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_openssl1.1.1.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 72% rename from .ci_support/linux_aarch64_openssl1.1.1.yaml rename to .ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index 51779afc5..3c1cb37bb 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -1,11 +1,13 @@ BUILD: - aarch64-conda_cos7-linux-gnu +build_type: +- release bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -17,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: @@ -29,25 +31,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: @@ -59,8 +45,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_openssl3.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml similarity index 72% rename from .ci_support/linux_aarch64_openssl3.yaml rename to .ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 53e3b515c..4bc4497fe 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -1,11 +1,13 @@ BUILD: - aarch64-conda_cos7-linux-gnu +build_type: +- release bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -17,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: @@ -29,25 +31,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: @@ -59,8 +45,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_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..a944a33cf --- /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: +- '11' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +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..b97e45252 --- /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: +- '11' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge python_debug +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +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_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 72% rename from .ci_support/linux_ppc64le_openssl1.1.1.yaml rename to .ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index c63c1ce62..8d8e4f7cc 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -1,9 +1,11 @@ +build_type: +- release bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -13,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: @@ -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: @@ -51,8 +39,10 @@ sqlite: target_platform: - linux-ppc64le 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_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml similarity index 71% rename from .ci_support/linux_ppc64le_openssl3.yaml rename to .ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 4650156c2..f8e7f0b84 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -1,9 +1,11 @@ +build_type: +- release bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -13,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: @@ -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: @@ -51,8 +39,10 @@ sqlite: target_platform: - linux-ppc64le 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_typedebugchannel_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_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml index bfb796d36..bc387620e 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: - '11.0' +build_type: +- debug 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_typedebugchannel_targetsconda-forge_mainopenssl3.yaml similarity index 75% rename from .ci_support/osx_64_openssl3.yaml rename to .ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml index cd767ce39..0df1e47f4 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' MACOSX_SDK_VERSION: - '11.0' +build_type: +- debug 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/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml new file mode 100644 index 000000000..9a5e3bdaa --- /dev/null +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1.yaml @@ -0,0 +1,51 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: +- '11.0' +build_type: +- release +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: +- x86_64-apple-darwin13.4.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-64 +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_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml new file mode 100644 index 000000000..325ec0153 --- /dev/null +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3.yaml @@ -0,0 +1,51 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: +- '11.0' +build_type: +- release +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: +- x86_64-apple-darwin13.4.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-64 +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_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_openssl1.1.1.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml similarity index 74% rename from .ci_support/osx_arm64_openssl1.1.1.yaml rename to .ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml index 2f40f85eb..d5acd3685 100644 --- a/.ci_support/osx_arm64_openssl1.1.1.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +build_type: +- release bzip2: - '1' c_compiler: @@ -23,23 +25,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: @@ -51,8 +39,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_arm64_openssl3.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml similarity index 74% rename from .ci_support/osx_arm64_openssl3.yaml rename to .ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml index 7e6939bd0..22a514744 100644 --- a/.ci_support/osx_arm64_openssl3.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_mainopenssl3.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +build_type: +- release bzip2: - '1' c_compiler: @@ -23,23 +25,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: @@ -51,8 +39,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/.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/.scripts/build_steps.sh b/.scripts/build_steps.sh index b4367e4fd..bf8c78c27 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}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a09..b3abaeb54 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" diff --git a/.travis.yml b/.travis.yml index 1d3625b27..46bba9863 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,42 @@ 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 + - 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_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - 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_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - 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_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - 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 diff --git a/README.md b/README.md index 0e6c8c19d..e1adb7d15 100644 --- a/README.md +++ b/README.md @@ -46,87 +46,157 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -259,6 +329,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/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: - - /.*/ 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: diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 7d53affa1..d315a0a8a 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 @@ -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 @@ -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 @@ -508,7 +514,15 @@ 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 [[ ${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}/include/python${VERABI} ${PREFIX}/include/python${VER} +fi + if [[ "$target_platform" == linux-* ]]; then rm ${PREFIX}/include/uuid.h fi diff --git a/recipe/build_static.sh b/recipe/build_static.sh index 2a1223f59..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= @@ -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 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9a00325a5..bb719aed0 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -6,3 +6,12 @@ numpy: - 1.16 MACOSX_SDK_VERSION: # [osx and x86_64] - 11.0 # [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 b84616c69..e2e298cc3 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' %} @@ -27,13 +27,12 @@ {% 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] + {% set debug = "_debug" %} {% else %} {% set py_interp_debug = "no" %} + {% set debug = "" %} {% endif %} package: @@ -84,6 +83,7 @@ source: build: number: {{ build_number }} + skip: true # [win and build_type != "release"] requirements: build: @@ -132,6 +132,9 @@ outputs: - 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 }} @@ -269,6 +272,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: @@ -288,9 +293,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] diff --git a/recipe/run_test.py b/recipe/run_test.py index f5d7f7cfa..6529b7e5a 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -86,6 +86,10 @@ import syslog import termios +if os.getenv('PY_INTERP_DEBUG') == 'yes': + if sys.platform != 'win32': + assert 'd' in sys.abiflags + assert 'gettotalrefcount' in dir(sys) if not (armv6l or armv7l or ppc64le or osx105): import tkinter @@ -93,10 +97,10 @@ 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 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 diff --git a/recipe/tests/cmake/CMakeLists.txt b/recipe/tests/cmake/CMakeLists.txt index 52c43d435..a13e20ae1 100644 --- a/recipe/tests/cmake/CMakeLists.txt +++ b/recipe/tests/cmake/CMakeLists.txt @@ -1,4 +1,8 @@ # https://martinopilia.com/posts/2018/09/15/building-python-extension.html +# 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) @@ -6,6 +10,7 @@ project(mymath) option(PY_VER, "Python version to use") find_package(PythonInterp ${PY_VER} REQUIRED) -# PATHS $ENV{CONDA_PREFIX}) +# PATHS $ENV{CONDA_PREFIX} + # This goes after, since it uses PythonInterp as hint find_package(PythonLibs ${PY_VER} REQUIRED)
VariantStatus
linux_64_openssl1.1.1linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - variant + variant
linux_64_openssl3linux_64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - variant + variant
linux_aarch64_openssl1.1.1linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - variant + variant
linux_aarch64_openssl3linux_64_build_typereleasechannel_targetsconda-forge_mainopenssl3 - variant + variant
linux_ppc64le_openssl1.1.1linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - variant + variant
linux_ppc64le_openssl3linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - variant + variant
osx_64_openssl1.1.1linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - variant + variant
osx_64_openssl3linux_aarch64_build_typereleasechannel_targetsconda-forge_mainopenssl3 - variant + variant
osx_arm64_openssl1.1.1linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl1.1.1 - variant + variant
osx_arm64_openssl3linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugopenssl3 - variant + variant
win_64_openssl1.1.1linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl1.1.1 - variant + variant
win_64_openssl3linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainopenssl3 - variant + variant + +
osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl1.1.1 + + variant + +
osx_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 + + variant + +
osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl1.1.1 + + variant + +
osx_64_build_typereleasechannel_targetsconda-forge_python_debugopenssl3 + + 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 + +
win_64_build_typedebugchannel_targetsconda-forge_mainopenssl3 + + variant