diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b42f4ff..e5b2cf4 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,76 +8,52 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_python3.10.____cpythonpython_implcpython: + CONFIG: linux_64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.7.____cpython: - CONFIG: linux_64_python3.7.____cpython + linux_64_python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____73_pypy: - CONFIG: linux_64_python3.8.____73_pypy + linux_64_python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython + linux_64_python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____73_pypy: - CONFIG: linux_64_python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpython: - CONFIG: linux_aarch64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.7.____cpython: - CONFIG: linux_aarch64_python3.7.____cpython + linux_aarch64_python3.10.____cpythonpython_implcpython: + CONFIG: linux_aarch64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.8.____73_pypy: - CONFIG: linux_aarch64_python3.8.____73_pypy + linux_aarch64_python3.7.____cpythonpython_implcpython: + CONFIG: linux_aarch64_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython + linux_aarch64_python3.8.____cpythonpython_implcpython: + CONFIG: linux_aarch64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.9.____73_pypy: - CONFIG: linux_aarch64_python3.9.____73_pypy + linux_aarch64_python3.9.____cpythonpython_implcpython: + CONFIG: linux_aarch64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.9.____cpython: - CONFIG: linux_aarch64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_python3.10.____cpython: - CONFIG: linux_ppc64le_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.7.____cpython: - CONFIG: linux_ppc64le_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.8.____73_pypy: - CONFIG: linux_ppc64le_python3.8.____73_pypy + linux_ppc64le_python3.10.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.8.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython + linux_ppc64le_python3.7.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.9.____73_pypy: - CONFIG: linux_ppc64le_python3.9.____73_pypy + linux_ppc64le_python3.8.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.9.____cpython: - CONFIG: linux_ppc64le_python3.9.____cpython + linux_ppc64le_python3.9.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 6642027..8601c84 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,17 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_python3.10.____cpythonpython_implcpython: + CONFIG: osx_64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython + osx_64_python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____73_pypy: - CONFIG: osx_64_python3.8.____73_pypy + osx_64_python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____73_pypy: - CONFIG: osx_64_python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index acd7907..43765fe 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,68 +8,44 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_python3.10.____cpythonpython_implcpython: + CONFIG: win_64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_python3.7.____cpython: - CONFIG: win_64_python3.7.____cpython + win_64_python3.7.____cpythonpython_implcpython: + CONFIG: win_64_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____73_pypy: - CONFIG: win_64_python3.8.____73_pypy + win_64_python3.8.____cpythonpython_implcpython: + CONFIG: win_64_python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____73_pypy: - CONFIG: win_64_python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_python3.9.____cpythonpython_implcpython: + CONFIG: win_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ 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 + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + 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) - Get-ChildItem -Path $batchDir + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - Get-ChildItem -Path ($batchDir + '\..') + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - 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 + displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 displayName: Set PYTHONUNBUFFERED @@ -86,25 +62,16 @@ jobs: call activate base run_conda_forge_build_setup displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - 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 + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) conda.exe mambabuild "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 diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index 7ca53e0..55c903b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_64_python3.7.____cpython.yaml rename to .ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml index 12de788..5e086f8 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - linux-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.8.____73_pypy.yaml deleted file mode 100644 index e7cf6d5..0000000 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index fb4c940..c276504 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - linux-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml deleted file mode 100644 index fa7a2e9..0000000 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index c3b34b9..b365522 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml similarity index 85% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml index 274f6a8..ab7bb33 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml @@ -20,5 +20,10 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml similarity index 85% rename from .ci_support/linux_aarch64_python3.7.____cpython.yaml rename to .ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml index 53c5fee..27ff579 100644 --- a/.ci_support/linux_aarch64_python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml @@ -20,5 +20,10 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml deleted file mode 100644 index 4c3ab50..0000000 --- a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,24 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml similarity index 85% rename from .ci_support/linux_aarch64_python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml index eb34b8c..45462bc 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml @@ -20,5 +20,10 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml deleted file mode 100644 index 0beffb0..0000000 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,24 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml similarity index 85% rename from .ci_support/linux_aarch64_python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml index 806e97b..113b8a5 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml @@ -20,5 +20,10 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-aarch64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_ppc64le_python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml index 6d67c80..3562317 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_ppc64le_python3.7.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml index 0ae69ca..fa0ca48 100644 --- a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml deleted file mode 100644 index 8f3d808..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_ppc64le_python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml index 5e4317e..f720da2 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml deleted file mode 100644 index 6aaac87..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml similarity index 83% rename from .ci_support/linux_ppc64le_python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml index 18c22a6..fd1c06f 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - linux-ppc64le +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 10124bd..f754365 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - osx-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/osx_64_python3.7.____cpython.yaml rename to .ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml index b018b59..6c17bdb 100644 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - osx-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml deleted file mode 100644 index 3ca3108..0000000 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '12' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml index 4e29a5f..bcb78b6 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - osx-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml deleted file mode 100644 index f504512..0000000 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,20 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '12' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index 21313c3..043d5af 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - osx-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 6495afc..cc03dd0 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 9932cee..e66377f 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 8b9578e..34bb807 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -16,5 +16,10 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - osx-arm64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml similarity index 77% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml index 9072373..320ca04 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml @@ -10,5 +10,10 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +python_impl: +- cpython target_platform: - win-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml similarity index 77% rename from .ci_support/win_64_python3.7.____cpython.yaml rename to .ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml index 8c83182..1676c98 100644 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ b/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml @@ -10,5 +10,10 @@ pin_run_as_build: max_pin: x.x python: - 3.7.* *_cpython +python_impl: +- cpython target_platform: - win-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/win_64_python3.8.____73_pypy.yaml b/.ci_support/win_64_python3.8.____73_pypy.yaml deleted file mode 100644 index c8b5a66..0000000 --- a/.ci_support/win_64_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml similarity index 77% rename from .ci_support/win_64_python3.8.____cpython.yaml rename to .ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml index 6da9c22..0092f34 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml @@ -10,5 +10,10 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +python_impl: +- cpython target_platform: - win-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/win_64_python3.9.____73_pypy.yaml b/.ci_support/win_64_python3.9.____73_pypy.yaml deleted file mode 100644 index 743c9b4..0000000 --- a/.ci_support/win_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_73_pypy -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml similarity index 77% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml index ccac1a5..6fa2777 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml @@ -10,5 +10,10 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +python_impl: +- cpython target_platform: - win-64 +zip_keys: +- - python + - python_impl diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ 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/.scripts/build_steps.sh b/.scripts/build_steps.sh index c6b23e8..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ 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}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3d85505..736a39a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -61,6 +61,10 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/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}" diff --git a/LICENSE.txt b/LICENSE.txt index 6ec1401..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +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 eafcea1..6cc013e 100644 --- a/README.md +++ b/README.md @@ -36,171 +36,115 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - @@ -225,45 +169,31 @@ Current build status - - - - - - - + - + - + - + diff --git a/build-locally.py b/build-locally.py index eec38a0..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,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/recipe/meta.yaml b/recipe/meta.yaml index 5e40703..1bc8c12 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "cytoolz" %} -{% set version = "0.11.2" %} +{% set version = "0.12.0" %} package: @@ -8,10 +8,11 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cytoolz-{{ version }}.tar.gz - sha256: ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4 + sha256: c105b05f85e03fbcd60244375968e62e44fe798c15a3531c922d531018d22412 build: - number: 2 + skip: True # [python_impl == 'pypy'] + number: 0 script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv --global-option=--with-cython requirements:
VariantStatus
linux_64_python3.10.____cpythonlinux_64_python3.10.____cpythonpython_implcpython - variant + variant
linux_64_python3.7.____cpythonlinux_64_python3.7.____cpythonpython_implcpython - variant + variant
linux_64_python3.8.____73_pypylinux_64_python3.8.____cpythonpython_implcpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_python3.9.____cpythonpython_implcpython - variant + variant
linux_64_python3.9.____73_pypylinux_aarch64_python3.10.____cpythonpython_implcpython - variant + variant
linux_64_python3.9.____cpythonlinux_aarch64_python3.7.____cpythonpython_implcpython - variant + variant
linux_aarch64_python3.10.____cpythonlinux_aarch64_python3.8.____cpythonpython_implcpython - variant + variant
linux_aarch64_python3.7.____cpythonlinux_aarch64_python3.9.____cpythonpython_implcpython - variant + variant
linux_aarch64_python3.8.____73_pypylinux_ppc64le_python3.10.____cpythonpython_implcpython - variant + variant
linux_aarch64_python3.8.____cpythonlinux_ppc64le_python3.7.____cpythonpython_implcpython - variant + variant
linux_aarch64_python3.9.____73_pypylinux_ppc64le_python3.8.____cpythonpython_implcpython - variant + variant
linux_aarch64_python3.9.____cpythonlinux_ppc64le_python3.9.____cpythonpython_implcpython - variant + variant
linux_ppc64le_python3.10.____cpythonosx_64_python3.10.____cpythonpython_implcpython - variant + variant
linux_ppc64le_python3.7.____cpythonosx_64_python3.7.____cpythonpython_implcpython - variant + variant
linux_ppc64le_python3.8.____73_pypyosx_64_python3.8.____cpythonpython_implcpython - variant + variant
linux_ppc64le_python3.8.____cpythonosx_64_python3.9.____cpythonpython_implcpython - variant - -
linux_ppc64le_python3.9.____73_pypy - - variant - -
linux_ppc64le_python3.9.____cpython - - variant - -
osx_64_python3.10.____cpython - - variant - -
osx_64_python3.7.____cpython - - variant - -
osx_64_python3.8.____73_pypy - - variant - -
osx_64_python3.8.____cpython - - variant - -
osx_64_python3.9.____73_pypy - - variant - -
osx_64_python3.9.____cpython - - variant + variant
win_64_python3.10.____cpython - - variant - -
win_64_python3.7.____cpython - - variant - -
win_64_python3.8.____73_pypywin_64_python3.10.____cpythonpython_implcpython - variant + variant
win_64_python3.8.____cpythonwin_64_python3.7.____cpythonpython_implcpython - variant + variant
win_64_python3.9.____73_pypywin_64_python3.8.____cpythonpython_implcpython - variant + variant
win_64_python3.9.____cpythonwin_64_python3.9.____cpythonpython_implcpython - variant + variant