From b4242a7f176a7679fedecdb863b5648267dc0935 Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Thu, 15 Feb 2024 15:54:53 -0600 Subject: [PATCH 01/11] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.15.21.12.40 --- .azure-pipelines/azure-pipelines-linux.yml | 23 ++-- .azure-pipelines/azure-pipelines-osx.yml | 17 ++- .azure-pipelines/azure-pipelines-win.yml | 113 ++++----------- .ci_support/README | 7 +- ...{linux_64_openssl3.yaml => linux_64_.yaml} | 28 +--- .ci_support/linux_64_openssl1.1.1.yaml | 63 --------- ...ch64_openssl3.yaml => linux_aarch64_.yaml} | 24 +--- .ci_support/linux_aarch64_openssl1.1.1.yaml | 65 --------- ...64le_openssl3.yaml => linux_ppc64le_.yaml} | 22 +-- .ci_support/linux_ppc64le_openssl1.1.1.yaml | 57 -------- .ci_support/migrations/libffi34.yaml | 7 - .ci_support/migrations/openssl3.yaml | 8 -- .../{osx_64_openssl3.yaml => osx_64_.yaml} | 24 +--- .ci_support/osx_64_openssl1.1.1.yaml | 61 -------- .../{win_64_openssl3.yaml => win_64_.yaml} | 6 +- .ci_support/win_64_openssl1.1.1.yaml | 22 --- .circleci/config.yml | 5 +- .drone.yml | 62 --------- .gitattributes | 2 + .github/workflows/webservices.yml | 2 +- .gitignore | 25 +++- .scripts/build_steps.sh | 27 +++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 18 ++- .scripts/run_osx_build.sh | 58 ++++++-- .scripts/run_win_build.bat | 120 ++++++++++++++++ .travis.yml | 32 +++-- LICENSE.txt | 32 +++-- README.md | 130 ++++++++---------- build-locally.py | 27 ++-- conda-forge.yml | 4 + 31 files changed, 423 insertions(+), 672 deletions(-) rename .ci_support/{linux_64_openssl3.yaml => linux_64_.yaml} (60%) delete mode 100644 .ci_support/linux_64_openssl1.1.1.yaml rename .ci_support/{linux_aarch64_openssl3.yaml => linux_aarch64_.yaml} (70%) delete mode 100644 .ci_support/linux_aarch64_openssl1.1.1.yaml rename .ci_support/{linux_ppc64le_openssl3.yaml => linux_ppc64le_.yaml} (70%) delete mode 100644 .ci_support/linux_ppc64le_openssl1.1.1.yaml delete mode 100644 .ci_support/migrations/libffi34.yaml delete mode 100644 .ci_support/migrations/openssl3.yaml rename .ci_support/{osx_64_openssl3.yaml => osx_64_.yaml} (68%) delete mode 100644 .ci_support/osx_64_openssl1.1.1.yaml rename .ci_support/{win_64_openssl3.yaml => win_64_.yaml} (84%) delete mode 100644 .ci_support/win_64_openssl1.1.1.yaml delete mode 100644 .drone.yml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d36fc0246..abcbeb9e9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,22 +8,13 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_openssl1.1.1: - CONFIG: linux_64_openssl1.1.1 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_openssl3: - CONFIG: linux_64_openssl3 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -34,8 +25,16 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d28353040..3bcc2aad8 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,14 +5,11 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: - osx_64_openssl1.1.1: - CONFIG: osx_64_openssl1.1.1 - UPLOAD_PACKAGES: 'True' - osx_64_openssl3: - CONFIG: osx_64_openssl3 + osx_64_: + CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 @@ -20,9 +17,17 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2269abbfe..d609fcdfd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,109 +5,48 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2022 strategy: matrix: - win_64_openssl1.1.1: - CONFIG: win_64_openssl1.1.1 - UPLOAD_PACKAGES: 'True' - win_64_openssl3: - CONFIG: win_64_openssl3 + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath - - Get-ChildItem -Path $batchDir - - Get-ChildItem -Path ($batchDir + '\..') - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - - task: CondaEnvironment@1 + - task: PythonScript@0 + displayName: 'Download Miniforge' inputs: - packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) - # Configure the VM - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - # Special cased version setting some more things! - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe - env: - PYTHONUNBUFFERED: 1 - condition: not(contains(variables['CONFIG'], 'vs2008')) - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/README b/.ci_support/README index e4e2dcec9..a47316be6 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_.yaml similarity index 60% rename from .ci_support/linux_64_openssl3.yaml rename to .ci_support/linux_64_.yaml index 8587d5bb8..11db30eea 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '12' cdt_name: - cos6 channel_sources: @@ -13,35 +13,19 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '12' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: - '3.4' ncurses: -- '6.2' +- '6' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: @@ -53,11 +37,9 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml deleted file mode 100644 index c673a97f3..000000000 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ /dev/null @@ -1,63 +0,0 @@ -bzip2: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -libffi: -- '3.4' -ncurses: -- '6.2' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' -readline: -- '8' -sqlite: -- '3' -target_platform: -- linux-64 -tk: -- '8.6' -xz: -- '5.2' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_.yaml similarity index 70% rename from .ci_support/linux_aarch64_openssl3.yaml rename to .ci_support/linux_aarch64_.yaml index 4d75df976..4dd590195 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '12' cdt_arch: - aarch64 cdt_name: @@ -17,35 +17,19 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: - '3.4' ncurses: -- '6.2' +- '6' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: @@ -57,7 +41,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version 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 865d5b911..000000000 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ /dev/null @@ -1,65 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -bzip2: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -libffi: -- '3.4' -ncurses: -- '6.2' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' -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_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_.yaml similarity index 70% rename from .ci_support/linux_ppc64le_openssl3.yaml rename to .ci_support/linux_ppc64le_.yaml index 95f0556cf..3d34dab15 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '12' cdt_name: - cos7 channel_sources: @@ -13,33 +13,19 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: - '3.4' ncurses: -- '6.2' +- '6' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - max_pin: x.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.7' readline: @@ -49,7 +35,7 @@ sqlite: target_platform: - linux-ppc64le xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml deleted file mode 100644 index 9b8d310c5..000000000 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ /dev/null @@ -1,57 +0,0 @@ -bzip2: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -libffi: -- '3.4' -ncurses: -- '6.2' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - max_pin: x.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.7' -readline: -- '8' -sqlite: -- '3' -target_platform: -- linux-ppc64le -xz: -- '5.2' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/migrations/libffi34.yaml b/.ci_support/migrations/libffi34.yaml deleted file mode 100644 index 328f8e3bf..000000000 --- a/.ci_support/migrations/libffi34.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libffi: -- '3.4' -migrator_ts: 1630622620.3080156 diff --git a/.ci_support/migrations/openssl3.yaml b/.ci_support/migrations/openssl3.yaml deleted file mode 100644 index ae551c1e9..000000000 --- a/.ci_support/migrations/openssl3.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1631932209.13688 -openssl: -- 1.1.1 -- '3' diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_.yaml similarity index 68% rename from .ci_support/osx_64_openssl3.yaml rename to .ci_support/osx_64_.yaml index 822faf96b..c07611f8c 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,35 +13,19 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '16' libffi: - '3.4' macos_machine: - x86_64-apple-darwin13.4.0 ncurses: -- '6.2' +- '6' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: @@ -53,7 +37,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml deleted file mode 100644 index 626e02927..000000000 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ /dev/null @@ -1,61 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -libffi: -- '3.4' -macos_machine: -- x86_64-apple-darwin13.4.0 -ncurses: -- '6.2' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' -readline: -- '8' -sqlite: -- '3' -target_platform: -- osx-64 -tk: -- '8.6' -xz: -- '5.2' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/win_64_openssl3.yaml b/.ci_support/win_64_.yaml similarity index 84% rename from .ci_support/win_64_openssl3.yaml rename to .ci_support/win_64_.yaml index 8b51e3fe5..9aa6750ea 100644 --- a/.ci_support/win_64_openssl3.yaml +++ b/.ci_support/win_64_.yaml @@ -1,19 +1,17 @@ c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 openssl: - '3' pin_run_as_build: python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x python: - '3.7' sqlite: diff --git a/.ci_support/win_64_openssl1.1.1.yaml b/.ci_support/win_64_openssl1.1.1.yaml deleted file mode 100644 index 3feb48b24..000000000 --- a/.ci_support/win_64_openssl1.1.1.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2017 -openssl: -- 1.1.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - sqlite: - max_pin: x -python: -- '3.7' -sqlite: -- '3' -target_platform: -- win-64 diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b80..8b4ef2f99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,14 @@ # 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 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index e9f1f1ea9..000000000 --- a/.drone.yml +++ /dev/null @@ -1,62 +0,0 @@ ---- -kind: pipeline -name: linux_aarch64_openssl1.1.1 - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_openssl1.1.1 - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - ---- -kind: pipeline -name: linux_aarch64_openssl3 - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_openssl3 - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - diff --git a/.gitattributes b/.gitattributes index 9060b272b..7f3276384 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ 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 @@ -18,6 +19,7 @@ bld.bat text eol=crlf .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 diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71fb..d6f06b5c9 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@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index c89ecb7d6..179afe55e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 367ed7913..01e8be63f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -22,12 +24,19 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -59,9 +73,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" @@ -70,7 +85,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c24..aff009f0c 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1f2..00f377a80 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,13 +14,19 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -75,12 +81,15 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ @@ -88,12 +97,15 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 96d02787b..1fa84683f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,21 +11,24 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -BUILD_CMD=build - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -42,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -49,21 +58,40 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null - echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -( startgroup "Validating outputs" ) 2> /dev/null +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi -validate_recipe_outputs "${FEEDSTOCK_NAME}" +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -( endgroup "Validating outputs" ) 2> /dev/null + # Drop into an interactive shell + /bin/bash +else -( startgroup "Uploading packages" ) 2> /dev/null + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + ( startgroup "Validating outputs" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 000000000..7bde26b50 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,120 @@ +:: 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. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 4b7077b3e..c833fba00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,24 @@ language: generic matrix: include: - - 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 + - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_ 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}) + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" + - 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 ./.scripts/run_docker_build.sh; 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/LICENSE.txt b/LICENSE.txt index ed3f451e6..2ec51d75f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +BSD-3-Clause license +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/README.md b/README.md index c51665444..05e08e679 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About python -============ +About python-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/main/LICENSE.txt) Home: http://www.python.org/ Package license: Python-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/master/LICENSE.txt) - Summary: General purpose programming language Development: https://docs.python.org/devguide/ @@ -28,15 +28,8 @@ Current build status - - - @@ -46,80 +39,45 @@ Current build status
Travis - - macOS - -
Drone - - linux + + linux
- - + + - - - - - - - - - - + - + - + - + - + - - - - - - @@ -147,23 +105,49 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `python` can be installed with: +Once the `conda-forge` channel has been enabled, `python` can be installed with `conda`: ``` conda install python ``` -It is possible to list all of the versions of `python` available on your platform with: +or with `mamba`: + +``` +mamba install python +``` + +It is possible to list all of the versions of `python` available on your platform with `conda`: ``` conda search python --channel conda-forge ``` +or with `mamba`: + +``` +mamba search python --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search python --channel conda-forge + +# List packages depending on `python`: +mamba repoquery whoneeds python --channel conda-forge + +# List dependencies of `python`: +mamba repoquery depends python --channel conda-forge +``` + About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the @@ -173,10 +157,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. diff --git a/build-locally.py b/build-locally.py index 00eeb34b1..3f4b7a794 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: @@ -60,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" - "to download the SDK automatically to '/opt/MacOSX.sdk'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) @@ -84,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": diff --git a/conda-forge.yml b/conda-forge.yml index a78bd843c..2a705c832 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,3 +2,7 @@ provider: {linux_aarch64: default, linux_ppc64le: default} conda_forge_output_validation: true conda_build: pkg_format: '2' +azure: + settings-win: + pool: + vmImage: vs2017-win2016 From 341c228ee1c171a7069574dca2bd7c8449fd824c Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Thu, 15 Feb 2024 15:58:35 -0600 Subject: [PATCH 02/11] build against libxcrypt on Linux Based this off the similar changeset for 3.8 branch in commit 716d0eff8cdd3ab71414027a0c312c292a3090ba --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 70fa94aae..5cfcc3d6d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,7 +75,7 @@ source: sha256: de3c87b26a80e789986d8e6950c6304175d3829afe9c6c7211eb7257266ab0ac # [win] build: - number: 100 + number: 101 # Windows has issues updating python if conda is using files itself. # Copy rather than link. no_link: @@ -139,6 +139,7 @@ requirements: - ncurses # [not win] - libffi # [not win] - libnsl # [linux] + - libxcrypt # [linux] - ld_impl_{{ target_platform }} >=2.34 # [linux] run: - ld_impl_{{ target_platform }} >=2.34 # [linux] From df779cd5b0607c04f9500cff2bd93a82fa50a9fa Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Thu, 15 Feb 2024 16:12:07 -0600 Subject: [PATCH 03/11] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.15.21.12.40 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- conda-forge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcdfd..a718c665a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2022 + vmImage: vs2017-win2016 strategy: matrix: win_64_: diff --git a/conda-forge.yml b/conda-forge.yml index 2a705c832..a9af120fd 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,6 +3,6 @@ conda_forge_output_validation: true conda_build: pkg_format: '2' azure: - settings-win: + settings_win: pool: vmImage: vs2017-win2016 From e014c87b56758ab46f9086fccd57437d367345c7 Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Thu, 15 Feb 2024 16:45:43 -0600 Subject: [PATCH 04/11] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.15.21.12.40 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- conda-forge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a718c665a..aff7369b1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: matrix: win_64_: diff --git a/conda-forge.yml b/conda-forge.yml index a9af120fd..4ed3add8d 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,4 +5,4 @@ conda_build: azure: settings_win: pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 From 181879db1d93bc97f73dbfecc506eca8914776ce Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Tue, 20 Feb 2024 11:54:53 -0600 Subject: [PATCH 05/11] restore .ci_support from 3.7 --- .ci_support/README | 7 +- .ci_support/linux_64_openssl1.1.1.yaml | 63 ++++++++++++++++++ ...{linux_64_.yaml => linux_64_openssl3.yaml} | 28 ++++++-- .ci_support/linux_aarch64_openssl1.1.1.yaml | 65 +++++++++++++++++++ ...ch64_.yaml => linux_aarch64_openssl3.yaml} | 24 +++++-- .ci_support/linux_ppc64le_openssl1.1.1.yaml | 57 ++++++++++++++++ ...64le_.yaml => linux_ppc64le_openssl3.yaml} | 22 +++++-- .ci_support/migrations/libffi34.yaml | 7 ++ .ci_support/migrations/openssl3.yaml | 8 +++ .ci_support/osx_64_openssl1.1.1.yaml | 61 +++++++++++++++++ .../{osx_64_.yaml => osx_64_openssl3.yaml} | 24 +++++-- .ci_support/win_64_openssl1.1.1.yaml | 22 +++++++ .../{win_64_.yaml => win_64_openssl3.yaml} | 6 +- 13 files changed, 369 insertions(+), 25 deletions(-) create mode 100644 .ci_support/linux_64_openssl1.1.1.yaml rename .ci_support/{linux_64_.yaml => linux_64_openssl3.yaml} (60%) create mode 100644 .ci_support/linux_aarch64_openssl1.1.1.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_openssl3.yaml} (70%) create mode 100644 .ci_support/linux_ppc64le_openssl1.1.1.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_openssl3.yaml} (70%) create mode 100644 .ci_support/migrations/libffi34.yaml create mode 100644 .ci_support/migrations/openssl3.yaml create mode 100644 .ci_support/osx_64_openssl1.1.1.yaml rename .ci_support/{osx_64_.yaml => osx_64_openssl3.yaml} (68%) create mode 100644 .ci_support/win_64_openssl1.1.1.yaml rename .ci_support/{win_64_.yaml => win_64_openssl3.yaml} (84%) diff --git a/.ci_support/README b/.ci_support/README index a47316be6..e4e2dcec9 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml new file mode 100644 index 000000000..c673a97f3 --- /dev/null +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -0,0 +1,63 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +libffi: +- '3.4' +ncurses: +- '6.2' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + 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.7' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-64 +tk: +- '8.6' +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_openssl3.yaml similarity index 60% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_openssl3.yaml index 11db30eea..8587d5bb8 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_openssl3.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '9' cdt_name: - cos6 channel_sources: @@ -13,19 +13,35 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '9' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-comp7 libffi: - '3.4' ncurses: -- '6' +- '6.2' openssl: - '3' pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + 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.7' readline: @@ -37,9 +53,11 @@ target_platform: tk: - '8.6' xz: -- '5' +- '5.2' zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml new file mode 100644 index 000000000..865d5b911 --- /dev/null +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -0,0 +1,65 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +libffi: +- '3.4' +ncurses: +- '6.2' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + 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.7' +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_.yaml b/.ci_support/linux_aarch64_openssl3.yaml similarity index 70% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_openssl3.yaml index 4dd590195..4d75df976 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '9' cdt_arch: - aarch64 cdt_name: @@ -17,19 +17,35 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '9' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libffi: - '3.4' ncurses: -- '6' +- '6.2' openssl: - '3' pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + 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.7' readline: @@ -41,7 +57,7 @@ target_platform: tk: - '8.6' xz: -- '5' +- '5.2' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml new file mode 100644 index 000000000..9b8d310c5 --- /dev/null +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -0,0 +1,57 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libffi: +- '3.4' +ncurses: +- '6.2' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + max_pin: x.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.7' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_openssl3.yaml similarity index 70% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_openssl3.yaml index 3d34dab15..95f0556cf 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '9' cdt_name: - cos7 channel_sources: @@ -13,19 +13,33 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '9' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libffi: - '3.4' ncurses: -- '6' +- '6.2' openssl: - '3' pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + max_pin: x.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.7' readline: @@ -35,7 +49,7 @@ sqlite: target_platform: - linux-ppc64le xz: -- '5' +- '5.2' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/migrations/libffi34.yaml b/.ci_support/migrations/libffi34.yaml new file mode 100644 index 000000000..328f8e3bf --- /dev/null +++ b/.ci_support/migrations/libffi34.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libffi: +- '3.4' +migrator_ts: 1630622620.3080156 diff --git a/.ci_support/migrations/openssl3.yaml b/.ci_support/migrations/openssl3.yaml new file mode 100644 index 000000000..ae551c1e9 --- /dev/null +++ b/.ci_support/migrations/openssl3.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1631932209.13688 +openssl: +- 1.1.1 +- '3' diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml new file mode 100644 index 000000000..626e02927 --- /dev/null +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -0,0 +1,61 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +libffi: +- '3.4' +macos_machine: +- x86_64-apple-darwin13.4.0 +ncurses: +- '6.2' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + 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.7' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-64 +tk: +- '8.6' +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_openssl3.yaml similarity index 68% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_openssl3.yaml index c07611f8c..822faf96b 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '11' channel_sources: - conda-forge channel_targets: @@ -13,19 +13,35 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '11' libffi: - '3.4' macos_machine: - x86_64-apple-darwin13.4.0 ncurses: -- '6' +- '6.2' openssl: - '3' pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + 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.7' readline: @@ -37,7 +53,7 @@ target_platform: tk: - '8.6' xz: -- '5' +- '5.2' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/win_64_openssl1.1.1.yaml b/.ci_support/win_64_openssl1.1.1.yaml new file mode 100644 index 000000000..3feb48b24 --- /dev/null +++ b/.ci_support/win_64_openssl1.1.1.yaml @@ -0,0 +1,22 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +openssl: +- 1.1.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x +python: +- '3.7' +sqlite: +- '3' +target_platform: +- win-64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_openssl3.yaml similarity index 84% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_openssl3.yaml index 9aa6750ea..8b51e3fe5 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_openssl3.yaml @@ -1,17 +1,19 @@ c_compiler: -- vs2019 +- vs2017 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2019 +- vs2017 openssl: - '3' pin_run_as_build: python: min_pin: x.x max_pin: x.x + sqlite: + max_pin: x python: - '3.7' sqlite: From 9b260acd3acdf9b4495a1f1be327880097d04369 Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Tue, 20 Feb 2024 12:42:19 -0600 Subject: [PATCH 06/11] hack up .azure-pipelines to revive openssl1.1.1 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++++-- .azure-pipelines/azure-pipelines-osx.yml | 9 ++++++--- .azure-pipelines/azure-pipelines-win.yml | 7 +++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index abcbeb9e9..293942a53 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -9,7 +9,11 @@ jobs: strategy: matrix: linux_64_: - CONFIG: linux_64_ + CONFIG: linux_64_openssl3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_: + CONFIG: linux_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 @@ -40,4 +44,4 @@ 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) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3bcc2aad8..e45182f7b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,8 +8,11 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_openssl3: + CONFIG: osx_64_openssl3 + UPLOAD_PACKAGES: 'True' + osx_64_openssl1.1.1: + CONFIG: osx_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 @@ -33,4 +36,4 @@ 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) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index aff7369b1..172344013 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,7 +8,10 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_: + win_64_openssl3: + CONFIG: win_64_ + UPLOAD_PACKAGES: 'True' + win_64_openssl1.1.1: CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 @@ -49,4 +52,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) 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) From ddafb80fd373cf2f1e4859bb1a8dcfebb880153b Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Tue, 20 Feb 2024 12:59:13 -0600 Subject: [PATCH 07/11] fix both linux_64 configs having the same name --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 293942a53..8bec71955 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,11 +8,11 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: + linux_64_openssl3: CONFIG: linux_64_openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_: + linux_64_openssl1.1.1: CONFIG: linux_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 From 9fa57faaf50b20c2eab7a297de0362d045f17a15 Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Tue, 20 Feb 2024 13:53:32 -0600 Subject: [PATCH 08/11] fix azure-pipelines windows using wrong cfg file --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 172344013..e6a0b612f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -9,10 +9,10 @@ jobs: strategy: matrix: win_64_openssl3: - CONFIG: win_64_ + CONFIG: win_64_openssl3 UPLOAD_PACKAGES: 'True' win_64_openssl1.1.1: - CONFIG: win_64_ + CONFIG: win_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: From ab1f401a58cdf8c141f4931382ae7858b0c9d19b Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Tue, 20 Feb 2024 15:13:34 -0600 Subject: [PATCH 09/11] not to be left out, hack up .travis.yml too --- .travis.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c833fba00..72695144c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,22 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - 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_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - 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 + + - 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_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal @@ -27,4 +37,4 @@ script: - 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 + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi From 6c70e6a336d4ea950449bd1bed1ddd87fdfc054e Mon Sep 17 00:00:00 2001 From: Aaron Opfer Date: Wed, 21 Feb 2024 07:15:03 -0600 Subject: [PATCH 10/11] fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72695144c..404ac2d51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: arch: ppc64le dist: focal - - 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_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal From a45a91eaca25b6488bb33a32155cd0e514fdba58 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 21 Feb 2024 13:31:48 -0800 Subject: [PATCH 11/11] Use a cbc for pinning to older builds --- .azure-pipelines/azure-pipelines-linux.yml | 11 +++-- .azure-pipelines/azure-pipelines-osx.yml | 9 ++-- .azure-pipelines/azure-pipelines-win.yml | 8 +-- .ci_support/README | 7 ++- .ci_support/linux_64_openssl1.1.1.yaml | 20 +------- .ci_support/linux_64_openssl3.yaml | 20 +------- .ci_support/linux_aarch64_openssl1.1.1.yaml | 16 ------ .ci_support/linux_aarch64_openssl3.yaml | 16 ------ .ci_support/linux_ppc64le_openssl1.1.1.yaml | 14 ------ .ci_support/linux_ppc64le_openssl3.yaml | 14 ------ .ci_support/migrations/libffi34.yaml | 7 --- .ci_support/migrations/openssl3.yaml | 8 --- .ci_support/osx_64_openssl1.1.1.yaml | 16 ------ .ci_support/osx_64_openssl3.yaml | 16 ------ .ci_support/win_64_openssl1.1.1.yaml | 2 - .ci_support/win_64_openssl3.yaml | 2 - .travis.yml | 14 +++--- README.md | 55 +++++++++++++++++---- azure-pipelines.yml | 4 +- recipe/conda_build_config.yaml | 17 +++++++ 20 files changed, 94 insertions(+), 182 deletions(-) delete mode 100644 .ci_support/migrations/libffi34.yaml delete mode 100644 .ci_support/migrations/openssl3.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8bec71955..9e9482cd5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,15 +8,16 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_openssl3: - CONFIG: linux_64_openssl3 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_openssl1.1.1: CONFIG: linux_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_openssl3: + CONFIG: linux_64_openssl3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -44,4 +45,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + 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 e45182f7b..6f6b5320c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,13 +8,14 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_openssl3: - CONFIG: osx_64_openssl3 - UPLOAD_PACKAGES: 'True' osx_64_openssl1.1.1: CONFIG: osx_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' + osx_64_openssl3: + CONFIG: osx_64_openssl3 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? @@ -36,4 +37,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + 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 e6a0b612f..c1826bd13 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,12 +8,12 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_openssl3: - CONFIG: win_64_openssl3 - UPLOAD_PACKAGES: 'True' win_64_openssl1.1.1: CONFIG: win_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' + win_64_openssl3: + CONFIG: win_64_openssl3 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -52,4 +52,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/README b/.ci_support/README index e4e2dcec9..a47316be6 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml index c673a97f3..69a8f5e27 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: - '3.4' ncurses: @@ -23,25 +23,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: @@ -57,7 +41,5 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml index 8587d5bb8..73d0a2de2 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_openssl3.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libffi: - '3.4' ncurses: @@ -23,25 +23,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: @@ -57,7 +41,5 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml index 865d5b911..193b9a049 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -27,25 +27,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml index 4d75df976..7794fa672 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -27,25 +27,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml index 9b8d310c5..d5272c6f5 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -23,23 +23,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - max_pin: x.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.7' readline: diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml index 95f0556cf..2ea82d41b 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -23,23 +23,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - max_pin: x.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.7' readline: diff --git a/.ci_support/migrations/libffi34.yaml b/.ci_support/migrations/libffi34.yaml deleted file mode 100644 index 328f8e3bf..000000000 --- a/.ci_support/migrations/libffi34.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libffi: -- '3.4' -migrator_ts: 1630622620.3080156 diff --git a/.ci_support/migrations/openssl3.yaml b/.ci_support/migrations/openssl3.yaml deleted file mode 100644 index ae551c1e9..000000000 --- a/.ci_support/migrations/openssl3.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1631932209.13688 -openssl: -- 1.1.1 -- '3' diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml index 626e02927..1cfdcf1ae 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -23,25 +23,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml index 822faf96b..6eadae0b1 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -23,25 +23,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - 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.7' readline: diff --git a/.ci_support/win_64_openssl1.1.1.yaml b/.ci_support/win_64_openssl1.1.1.yaml index 3feb48b24..c73c5e5d3 100644 --- a/.ci_support/win_64_openssl1.1.1.yaml +++ b/.ci_support/win_64_openssl1.1.1.yaml @@ -12,8 +12,6 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x python: - '3.7' sqlite: diff --git a/.ci_support/win_64_openssl3.yaml b/.ci_support/win_64_openssl3.yaml index 8b51e3fe5..ae89a8ee7 100644 --- a/.ci_support/win_64_openssl3.yaml +++ b/.ci_support/win_64_openssl3.yaml @@ -12,8 +12,6 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x python: - '3.7' sqlite: diff --git a/.travis.yml b/.travis.yml index 404ac2d51..4bc23dc3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,22 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - 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_ppc64le_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_aarch64_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux - arch: ppc64le + arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux - arch: arm64 + arch: ppc64le 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_ppc64le_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal @@ -37,4 +37,4 @@ script: - 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 + - 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 05e08e679..e9cd84735 100644 --- a/README.md +++ b/README.md @@ -46,38 +46,73 @@ Current build status
VariantStatus
linux_64_openssl1.1.1 - - variant - -
linux_64_openssl3 - - variant - -
linux_aarch64_openssl1.1.1 - - variant - -
linux_aarch64_openssl3linux_64 - - variant + + variant
linux_ppc64le_openssl1.1.1linux_aarch64 - - variant + + variant
linux_ppc64le_openssl3linux_ppc64le - - variant + + variant
osx_64_openssl1.1.1osx_64 - - variant + + variant
osx_64_openssl3win_64 - - variant - -
win_64_openssl1.1.1 - - variant - -
win_64_openssl3 - - variant + + variant
- + - + - + - + - + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f505..e5306da98 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 95750a61e..9d1e70b31 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,3 +4,20 @@ python_impl: - cpython numpy: - 1.16 +openssl: + - 3 + - 1.1.1 +c_compiler: # [win] + - vs2017 # [win] +c_compiler_version: # [unix] + - 9 # [linux] + - 11 # [osx] +cxx_compiler: # [win] + - vs2017 # [win] +cxx_compiler_version: # [unix] + - 9 # [linux] + - 11 # [osx] +ncurses: + - 6.2 +xz: + - 5.2
VariantStatus
linux_64linux_64_openssl1.1.1 - variant + variant
linux_aarch64linux_64_openssl3 - variant + variant
linux_ppc64lelinux_aarch64_openssl1.1.1 - variant + variant
osx_64linux_aarch64_openssl3 - variant + variant
win_64linux_ppc64le_openssl1.1.1 - variant + variant + +
linux_ppc64le_openssl3 + + variant + +
osx_64_openssl1.1.1 + + variant + +
osx_64_openssl3 + + variant + +
win_64_openssl1.1.1 + + variant + +
win_64_openssl3 + + variant