From d7dcb8bc78bfa236143aa166e1b3263c102940f9 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Sat, 10 Sep 2022 12:33:41 +0200 Subject: [PATCH] Update meta.yaml (#25) * Update meta.yaml * MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.09.07.11.44 Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> --- .azure-pipelines/azure-pipelines-linux.yml | 24 +--- .azure-pipelines/azure-pipelines-osx.yml | 48 -------- ...hon3.8.____cpython.yaml => linux_64_.yaml} | 8 -- .../linux_64_python3.10.____cpython.yaml | 16 --- .../linux_64_python3.7.____cpython.yaml | 16 --- .../linux_64_python3.8.____73_pypy.yaml | 16 --- .../linux_64_python3.9.____73_pypy.yaml | 16 --- .../linux_64_python3.9.____cpython.yaml | 16 --- .ci_support/migrations/python310.yaml | 33 ------ .../osx_64_python3.10.____cpython.yaml | 16 --- .ci_support/osx_64_python3.7.____cpython.yaml | 16 --- .ci_support/osx_64_python3.8.____73_pypy.yaml | 16 --- .ci_support/osx_64_python3.8.____cpython.yaml | 16 --- .ci_support/osx_64_python3.9.____73_pypy.yaml | 16 --- .ci_support/osx_64_python3.9.____cpython.yaml | 16 --- .scripts/run_osx_build.sh | 91 --------------- README.md | 104 +----------------- azure-pipelines.yml | 3 +- recipe/meta.yaml | 8 +- 19 files changed, 11 insertions(+), 484 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-osx.yml rename .ci_support/{linux_64_python3.8.____cpython.yaml => linux_64_.yaml} (55%) delete mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.8.____73_pypy.yaml delete mode 100644 .ci_support/linux_64_python3.9.____73_pypy.yaml delete mode 100644 .ci_support/linux_64_python3.9.____cpython.yaml delete mode 100644 .ci_support/migrations/python310.yaml delete mode 100644 .ci_support/osx_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.7.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.8.____73_pypy.yaml delete mode 100644 .ci_support/osx_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.9.____73_pypy.yaml delete mode 100644 .ci_support/osx_64_python3.9.____cpython.yaml delete mode 100755 .scripts/run_osx_build.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 40b9519..974e878 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,28 +8,8 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.7.____cpython: - CONFIG: linux_64_python3.7.____cpython - 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 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython - 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 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100755 index 4091c18..0000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: osx - pool: - vmImage: macOS-11 - strategy: - matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____73_pypy: - CONFIG: osx_64_python3.8.____73_pypy - 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 - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - - steps: - # TODO: Fast finish on azure pipelines? - - script: | - export CI=azure - 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: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_.yaml similarity index 55% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_.yaml index 7b5ae5c..6c59082 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_.yaml @@ -6,11 +6,3 @@ 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.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml deleted file mode 100644 index 84cccee..0000000 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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.10.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml deleted file mode 100644 index 9e6fd27..0000000 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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.7.* *_cpython -target_platform: -- linux-64 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 1b0ff54..0000000 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml deleted file mode 100644 index b3364bb..0000000 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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.____cpython.yaml deleted file mode 100644 index 50d8196..0000000 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -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.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/migrations/python310.yaml b/.ci_support/migrations/python310.yaml deleted file mode 100644 index f61ae7a..0000000 --- a/.ci_support/migrations/python310.yaml +++ /dev/null @@ -1,33 +0,0 @@ -migrator_ts: 1634137107 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - paused: false - longterm: True - pr_limit: 40 - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.10.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.21 -python_impl: - - cpython diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml deleted file mode 100644 index 48d3e80..0000000 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.10.* *_cpython -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml deleted file mode 100644 index 3de984b..0000000 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.7.* *_cpython -target_platform: -- osx-64 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 f92fbea..0000000 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.____cpython.yaml deleted file mode 100644 index 76bbd40..0000000 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.* *_cpython -target_platform: -- osx-64 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 064e9b0..0000000 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.____cpython.yaml deleted file mode 100644 index ab5e193..0000000 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -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.* *_cpython -target_platform: -- osx-64 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh deleted file mode 100755 index 07de621..0000000 --- a/.scripts/run_osx_build.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/env bash - -# -*- mode: jinja-shell -*- - -source .scripts/logging_utils.sh - -set -xe - -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="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 - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh -conda activate base - -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 - - - -echo -e "\n\nSetting up the condarc and mangling the compiler." -setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ "${CI:-}" != "" ]]; then - mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -fi - -if [[ "${CI:-}" != "" ]]; then - echo -e "\n\nMangling homebrew in the CI to avoid conflicts." - /usr/bin/sudo mangle_homebrew - /usr/bin/sudo -k -else - echo -e "\n\nNot mangling homebrew as we are not running in CI" -fi - -echo -e "\n\nRunning the build setup script." -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 - - -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}" - fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - # Drop into an interactive shell - /bin/bash -else - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - ( startgroup "Validating outputs" ) 2> /dev/null - - 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 -fi \ No newline at end of file diff --git a/README.md b/README.md index 2750548..f5a21fc 100644 --- a/README.md +++ b/README.md @@ -13,107 +13,11 @@ Current build status ==================== - - - - +
Azure
All platforms: -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_python3.10.____cpython - - variant - -
linux_64_python3.7.____cpython - - variant - -
linux_64_python3.8.____73_pypy - - variant - -
linux_64_python3.8.____cpython - - variant - -
linux_64_python3.9.____73_pypy - - variant - -
linux_64_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 - -
-
+ + +
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..ad85a2c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,5 +3,4 @@ # -*- mode: yaml -*- jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eeea8db..a9bb1c3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 7e15dd1ef94f06e1aa00ac0dabe05b9e312633a7e58fa5e2361459e7f915f4c5 build: - number: 4 + number: 5 entry_points: - circusd = circus.circusd:main - circusd-stats = circus.stats:main @@ -18,14 +18,14 @@ build: - circus-top = circus.stats.client:main - circus-plugin = circus.plugins:main script: {{ PYTHON }} -m pip install . --no-deps -vv - skip: true # [win] + noarch: python requirements: host: - - python + - python >=3.5 - pip run: - - python + - python >=3.5 - psutil - pyzmq >=17.0 - tornado >=5.0.2