diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 141133e..9e83b08 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,24 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_64_python3.6.____cpython: - CONFIG: linux_64_python3.6.____cpython + linux_64_python3.6.____73_pypypython_implpypy: + CONFIG: linux_64_python3.6.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.7.____cpython: - CONFIG: linux_64_python3.7.____cpython + linux_64_python3.6.____cpythonpython_implcpython: + CONFIG: linux_64_python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython + linux_64_python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_python3.8.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8aadc55..b1e21dc 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,20 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_python3.6.____cpython: - CONFIG: osx_64_python3.6.____cpython + osx_64_python3.6.____73_pypypython_implpypy: + CONFIG: osx_64_python3.6.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython + osx_64_python3.6.____cpythonpython_implcpython: + CONFIG: osx_64_python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_python3.8.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_python3.6.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.6.____73_pypypython_implpypy.yaml new file mode 100644 index 0000000..a7c2f57 --- /dev/null +++ b/.ci_support/linux_64_python3.6.____73_pypypython_implpypy.yaml @@ -0,0 +1,21 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.6.* *_73_pypy +python_impl: +- pypy +target_platform: +- linux-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/linux_64_python3.6.____cpython.yaml rename to .ci_support/linux_64_python3.6.____cpythonpython_implcpython.yaml index dea0f54..f94c12e 100644 --- a/.ci_support/linux_64_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_python3.6.____cpythonpython_implcpython.yaml @@ -12,5 +12,10 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_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 81% rename from .ci_support/linux_64_python3.7.____cpython.yaml rename to .ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml index c6902c2..e9818fe 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml @@ -12,5 +12,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.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index 6a81208..0741527 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -12,5 +12,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.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index ea216d6..1c4d3cf 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -12,5 +12,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/migrations/pypy.yaml b/.ci_support/migrations/pypy.yaml new file mode 100644 index 0000000..8b3fb45 --- /dev/null +++ b/.ci_support/migrations/pypy.yaml @@ -0,0 +1,43 @@ +migrator_ts: 1580746218 # The timestamp of when the migration was made +__migrator: + kind: + version + exclude: + - c_compiler + - vc + - cxx_compiler + - cuda_compiler_version + - docker_image + migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration + 1 + bump_number: 1 # Hashes changed for cpython, so it's better to bump build numbers. + # do not use mamba to check if the issued PRs are solvable + check_solvable: false + +python: + - 3.6.* *_cpython # [not (osx and arm64)] + - 3.7.* *_cpython # [not (osx and arm64)] + - 3.8.* *_cpython + - 3.6.* *_73_pypy # [not (win64 or (osx and arm64))] + +numpy: + - 1.16 # [not (osx and arm64)] + - 1.16 # [not (osx and arm64)] + - 1.16 + - 1.18 # [not (win64 or (osx and arm64))] + +python_impl: + - cpython # [not (osx and arm64)] + - cpython # [not (osx and arm64)] + - cpython + - pypy # [not (win64 or (osx and arm64))] + + +zip_keys: + - + - python + - numpy + - python_impl + - # [linux64] + - cuda_compiler_version # [linux64] + - docker_image # [linux64] diff --git a/.ci_support/osx_64_python3.6.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.6.____73_pypypython_implpypy.yaml new file mode 100644 index 0000000..e23f410 --- /dev/null +++ b/.ci_support/osx_64_python3.6.____73_pypypython_implpypy.yaml @@ -0,0 +1,21 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge,defaults +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.6.* *_73_pypy +python_impl: +- pypy +target_platform: +- osx-64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/osx_64_python3.6.____cpython.yaml b/.ci_support/osx_64_python3.6.____cpythonpython_implcpython.yaml similarity index 81% rename from .ci_support/osx_64_python3.6.____cpython.yaml rename to .ci_support/osx_64_python3.6.____cpythonpython_implcpython.yaml index e5f17c2..fd3d9cc 100644 --- a/.ci_support/osx_64_python3.6.____cpython.yaml +++ b/.ci_support/osx_64_python3.6.____cpythonpython_implcpython.yaml @@ -12,5 +12,10 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_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 163d3ce..d61e33e 100644 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml @@ -12,5 +12,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.____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 63cee21..53cfbfb 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -12,5 +12,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.____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 51915a8..8aa6035 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -12,5 +12,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/win_64_python3.6.____cpython.yaml b/.ci_support/win_64_python3.6.____cpython.yaml index 96be81f..76d016d 100644 --- a/.ci_support/win_64_python3.6.____cpython.yaml +++ b/.ci_support/win_64_python3.6.____cpython.yaml @@ -8,5 +8,10 @@ pin_run_as_build: max_pin: x.x python: - 3.6.* *_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.____cpython.yaml index 281bd46..e3bf3e1 100644 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ b/.ci_support/win_64_python3.7.____cpython.yaml @@ -8,5 +8,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.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index 0840c1a..325282d 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -8,5 +8,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.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index f427bd2..8581c73 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -8,5 +8,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/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db..36dacd6 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -45,8 +45,12 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -64,8 +68,8 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -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 \ diff --git a/README.md b/README.md index 2c8f2ea..35c0dc8 100644 --- a/README.md +++ b/README.md @@ -29,59 +29,73 @@ Current build status - + - + - + - + - + - + - + - + + + + + + + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3f38e96..86aa262 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: sha256: 2439f9d71d793d72d4e223632b9ef8beafc021989efac7b049f0c73280322d2a build: - number: 2 + number: 3 script: cd dist && {{ PYTHON }} -m pip install . -vv --no-deps skip: true # [py<36] @@ -48,7 +48,7 @@ test: - trio - trustme # TODO: won't be available on pypy - - uvloop # [unix] + - uvloop # [unix and python_impl == 'cpython'] imports: - anyio commands:
VariantStatus
linux_64_python3.6.____cpythonlinux_64_python3.6.____73_pypypython_implpypy - variant + variant
linux_64_python3.7.____cpythonlinux_64_python3.6.____cpythonpython_implcpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_python3.7.____cpythonpython_implcpython - variant + variant
linux_64_python3.9.____cpythonlinux_64_python3.8.____cpythonpython_implcpython - variant + variant
osx_64_python3.6.____cpythonlinux_64_python3.9.____cpythonpython_implcpython - variant + variant
osx_64_python3.7.____cpythonosx_64_python3.6.____73_pypypython_implpypy - variant + variant
osx_64_python3.8.____cpythonosx_64_python3.6.____cpythonpython_implcpython - variant + variant
osx_64_python3.9.____cpythonosx_64_python3.7.____cpythonpython_implcpython - variant + variant + +
osx_64_python3.8.____cpythonpython_implcpython + + variant + +
osx_64_python3.9.____cpythonpython_implcpython + + variant