From 3414c46d80c1d8ca9dd77929db71444af4d41a23 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Wed, 30 Mar 2022 17:13:45 -0700 Subject: [PATCH 1/2] sync deps with regular python build system --- recipe/meta.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c1ba54d..75b0d6b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,23 +11,22 @@ source: build: entry_points: - sourmash = sourmash.__main__:main - number: 0 + number: 1 missing_dso_whitelist: # [osx] - /usr/lib/libresolv.9.dylib # [osx] - skip: true # [py<37] + skip: true # [py<38] requirements: build: - {{ compiler('c') }} # [not win] - {{ compiler('m2w64_c') }} # [win] - # Pinning rust due to https://github.com/conda-forge/rust-feedstock/issues/73 - - rust >=1.37.0,<=1.48 + - rust >=1.48.0 host: - python - pip - - setuptools >=38.6.0 + - setuptools >=48,<60 - milksnake - - setuptools_scm >=3.2.0 + - setuptools_scm >=4,<6 - setuptools_scm_git_archive run: @@ -36,7 +35,7 @@ requirements: - screed >=1.0.5 - cffi >=1.14 - deprecation >=2.0.6 - - cachetools >=4.2.1 + - cachetools >=4.2.1,<5 - numpy test: From 509e02a264539e4a2a3af8df614493441a276094 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 01:13:59 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.03.30.18.03.29 --- .azure-pipelines/azure-pipelines-linux.yml | 48 ----- .azure-pipelines/azure-pipelines-osx.yml | 6 - .azure-pipelines/azure-pipelines-win.yml | 3 - .../linux_64_python3.7.____73_pypy.yaml | 20 -- .../linux_64_python3.7.____cpython.yaml | 20 -- .../linux_aarch64_python3.7.____73_pypy.yaml | 24 --- .../linux_aarch64_python3.7.____cpython.yaml | 24 --- .../linux_ppc64le_python3.7.____73_pypy.yaml | 20 -- .../linux_ppc64le_python3.7.____cpython.yaml | 20 -- .ci_support/osx_64_python3.7.____73_pypy.yaml | 20 -- .ci_support/osx_64_python3.7.____cpython.yaml | 20 -- .ci_support/win_64_python3.7.____cpython.yaml | 14 -- .travis.yml | 47 +++++ README.md | 177 ++++++++---------- 14 files changed, 121 insertions(+), 342 deletions(-) delete mode 100644 .ci_support/linux_64_python3.7.____73_pypy.yaml delete mode 100644 .ci_support/linux_64_python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.7.____73_pypy.yaml delete mode 100644 .ci_support/linux_aarch64_python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.7.____73_pypy.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.7.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.7.____73_pypy.yaml delete mode 100644 .ci_support/osx_64_python3.7.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.7.____cpython.yaml create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d02ed62..91aec1d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,14 +12,6 @@ jobs: CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.7.____73_pypy: - CONFIG: linux_64_python3.7.____73_pypy - 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.____cpython: CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -28,46 +20,6 @@ jobs: 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.____73_pypy: - CONFIG: linux_aarch64_python3.7.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.7.____cpython: - CONFIG: linux_aarch64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython - 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.____73_pypy: - CONFIG: linux_ppc64le_python3.7.____73_pypy - 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.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.9.____cpython: - CONFIG: linux_ppc64le_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index b91da08..d565d3f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,12 +11,6 @@ jobs: osx_64_python3.10.____cpython: CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____73_pypy: - CONFIG: osx_64_python3.7.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9041540..0e9dec9 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,6 @@ jobs: win_64_python3.10.____cpython: CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.7.____cpython: - CONFIG: win_64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' win_64_python3.8.____cpython: CONFIG: win_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.7.____73_pypy.yaml b/.ci_support/linux_64_python3.7.____73_pypy.yaml deleted file mode 100644 index 1501387..0000000 --- a/.ci_support/linux_64_python3.7.____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.7.* *_73_pypy -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 12de788..0000000 --- a/.ci_support/linux_64_python3.7.____cpython.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.7.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_aarch64_python3.7.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.7.____73_pypy.yaml deleted file mode 100644 index 5ee192a..0000000 --- a/.ci_support/linux_aarch64_python3.7.____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.7.* *_73_pypy -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/.ci_support/linux_aarch64_python3.7.____cpython.yaml deleted file mode 100644 index 53c5fee..0000000 --- a/.ci_support/linux_aarch64_python3.7.____cpython.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.7.* *_cpython -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_ppc64le_python3.7.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.7.____73_pypy.yaml deleted file mode 100644 index 9aa3693..0000000 --- a/.ci_support/linux_ppc64le_python3.7.____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.7.* *_73_pypy -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_python3.7.____cpython.yaml deleted file mode 100644 index 0ae69ca..0000000 --- a/.ci_support/linux_ppc64le_python3.7.____cpython.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.7.* *_cpython -target_platform: -- linux-ppc64le diff --git a/.ci_support/osx_64_python3.7.____73_pypy.yaml b/.ci_support/osx_64_python3.7.____73_pypy.yaml deleted file mode 100644 index 9e91213..0000000 --- a/.ci_support/osx_64_python3.7.____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.7.* *_73_pypy -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 b018b59..0000000 --- a/.ci_support/osx_64_python3.7.____cpython.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.7.* *_cpython -target_platform: -- osx-64 diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_python3.7.____cpython.yaml deleted file mode 100644 index 405854f..0000000 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -m2w64_c_compiler: -- m2w64-toolchain -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -target_platform: -- win-64 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ca68b6f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,47 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.9.____cpython 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}) + - 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 diff --git a/README.md b/README.md index db3f41b..fcde2e0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://github.com/sourmash-bio/sourmash Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/sourmash-minimal-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/sourmash-minimal-feedstock/blob/main/LICENSE.txt) Summary: Compute and compare MinHash signatures for DNA data sets. @@ -21,15 +21,22 @@ Current build status ==================== - +
+ + +
Travis + + linux + +
Azure
- - + + @@ -37,169 +44,106 @@ Current build status - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,18 +171,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `sourmash-minimal` can be installed with: +Once the `conda-forge` channel has been enabled, `sourmash-minimal` can be installed with `conda`: ``` conda install sourmash-minimal ``` -It is possible to list all of the versions of `sourmash-minimal` available on your platform with: +or with `mamba`: + +``` +mamba install sourmash-minimal +``` + +It is possible to list all of the versions of `sourmash-minimal` available on your platform with `conda`: ``` conda search sourmash-minimal --channel conda-forge ``` +or with `mamba`: + +``` +mamba search sourmash-minimal --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search sourmash-minimal --channel conda-forge + +# List packages depending on `sourmash-minimal`: +mamba repoquery whoneeds sourmash-minimal --channel conda-forge + +# List dependencies of `sourmash-minimal`: +mamba repoquery depends sourmash-minimal --channel conda-forge +``` + About conda-forge ================= @@ -254,10 +223,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-Cloud](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.
linux_64_python3.10.____cpython - - variant - -
linux_64_python3.7.____73_pypy - - variant - -
linux_64_python3.7.____cpython - - variant + + variant
linux_64_python3.8.____cpython - - variant + + variant
linux_64_python3.9.____cpython - - variant + + variant
linux_aarch64_python3.10.____cpython - - variant - -
linux_aarch64_python3.7.____73_pypy - - variant - -
linux_aarch64_python3.7.____cpython - - variant + + variant
linux_aarch64_python3.8.____cpython - - variant + + variant
linux_aarch64_python3.9.____cpython - - variant + + variant
linux_ppc64le_python3.10.____cpython - - variant - -
linux_ppc64le_python3.7.____73_pypy - - variant - -
linux_ppc64le_python3.7.____cpython - - variant + + variant
linux_ppc64le_python3.8.____cpython - - variant + + variant
linux_ppc64le_python3.9.____cpython - - variant + + variant
osx_64_python3.10.____cpython - - variant - -
osx_64_python3.7.____73_pypy - - variant - -
osx_64_python3.7.____cpython - - variant + + variant
osx_64_python3.8.____cpython - - variant + + variant
osx_64_python3.9.____cpython - - variant + + variant
win_64_python3.10.____cpython - - variant - -
win_64_python3.7.____cpython - - variant + + variant
win_64_python3.8.____cpython - - variant + + variant
win_64_python3.9.____cpython - - variant + + variant