diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..8535c3f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip mamba rattler-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip mamba rattler-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -60,20 +60,16 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then 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_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - - # Drop into an interactive shell - /bin/bash + echo "rattler-build currently doesn't support debug mode" else - conda-build "${RECIPE_ROOT}" -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:-}" + + rattler-build build --recipe "${RECIPE_ROOT}" \ + -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --target-platform "${HOST_PLATFORM}" \ + --extra-meta flow_run_id="${flow_run_id:-}" \ + --extra-meta remote_url="${remote_url:-}" \ + --extra-meta sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..9172d01 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip mamba rattler-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip mamba rattler-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -58,33 +58,25 @@ 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 + echo "rattler-build does not currently support debug mode" else if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda-build ./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" + rattler-build build --recipe ./recipe \ + -m ./.ci_support/${CONFIG}.yaml \ + --output-dir ${MINIFORGE_HOME}/conda-bld ${EXTRA_CB_OPTIONS:-} \ + --target-platform "${HOST_PLATFORM}" \ + --extra-meta flow_run_id="$flow_run_id" \ + --extra-meta remote_url="$remote_url" \ + --extra-meta sha="$sha" ( startgroup "Inspecting artifacts" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index a45c34f..bdb434f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba rattler-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,14 +48,14 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) 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%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% --extra-meta remote_url=%remote_url% --extra-meta sha=%sha%" ) call :end_group :: Build the recipe echo Building recipe -conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe run rattler-build build --recipe "recipe" -m .ci_support\%CONFIG%.yaml %EXTRA_CB_OPTIONS% --target-platform %HOST_PLATFORM% if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" diff --git a/README.md b/README.md index 45ab97c..188e17a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About sourmash-minimal-feedstock ================================ -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/win_build-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/sourmash-minimal-feedstock/blob/main/LICENSE.txt) Home: https://github.com/sourmash-bio/sourmash @@ -24,8 +24,8 @@ Current build status
- - + + @@ -33,169 +33,169 @@ Current build status diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 579bd76..32da3d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,6 @@ stages: RET: 'true' steps: - checkout: self - fetchDepth: '2' - bash: | git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` diff --git a/conda-forge.yml b/conda-forge.yml index 763f63f..41dd648 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,6 +7,7 @@ build_platform: osx_arm64: osx_64 conda_build: pkg_format: '2' +conda_build_tool: rattler-build conda_forge_output_validation: true github: branch_name: main diff --git a/recipe/bld.bat b/recipe/build.bat similarity index 100% rename from recipe/bld.bat rename to recipe/build.bat diff --git a/recipe/meta.yaml b/recipe/meta.yaml deleted file mode 100644 index 0f9eb9d..0000000 --- a/recipe/meta.yaml +++ /dev/null @@ -1,75 +0,0 @@ -{% set version = "4.8.11" %} - -package: - name: sourmash-minimal - version: {{ version }} - -source: - url: https://pypi.io/packages/source/s/sourmash/sourmash-{{ version }}.tar.gz - sha256: 1a06a76df464b92685779aaaa6ed02a577bdd73a4ab32972e8134581034d34bf - -build: - entry_points: - - sourmash = sourmash.__main__:main - number: 2 - missing_dso_whitelist: # [osx] - - /usr/lib/libresolv.9.dylib # [osx] - skip: true # [py<310] - -requirements: - build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - crossenv # [build_platform != target_platform] - - cffi # [build_platform != target_platform] - - {{ compiler('c') }} - - {{ stdlib("c") }} - - {{ compiler('cxx') }} - - {{ compiler('rust') }} >=1.65.0 - - maturin - - cargo-bundle-licenses - - libclang # [unix] - - clangdev # [unix] - - xz - host: - - python - - pip - - maturin - - toml - - cffi - - run: - - python - - screed >=1.1.2 - - cffi >=1.17.1 - - deprecation >=2.0.6 - - cachetools >=4.2.1,<5 - - numpy - - matplotlib-base - - scipy - - bitstring >=3.1.9,<4 - -test: - imports: - - sourmash - - commands: - - sourmash --help - - sourmash info - -about: - home: https://github.com/sourmash-bio/sourmash - summary: Compute and compare MinHash signatures for DNA data sets. - license: BSD-3-Clause - license_family: BSD - license_file: - - LICENSE - - THIRDPARTY.yml - dev_url: https://github.com/sourmash-bio/sourmash - doc_url: https://sourmash.bio/ - -extra: - recipe-maintainers: - - luizirber - - ctb - - bluegenes diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml new file mode 100644 index 0000000..94cf9ba --- /dev/null +++ b/recipe/recipe.yaml @@ -0,0 +1,88 @@ +context: + version: 4.8.11 + +package: + name: sourmash-minimal + version: ${{ version }} + +source: + url: https://pypi.io/packages/source/s/sourmash/sourmash-${{ version }}.tar.gz + sha256: 1a06a76df464b92685779aaaa6ed02a577bdd73a4ab32972e8134581034d34bf + +build: + number: 3 + skip: + - match(python, "<3.10") + python: + entry_points: + - sourmash = sourmash.__main__:main + dynamic_linking: + missing_dso_allowlist: + - if: osx + then: /usr/lib/libresolv.9.dylib + +requirements: + build: + - ${{ compiler('c') }} + - ${{ stdlib('c') }} + - ${{ compiler('cxx') }} + - ${{ compiler('rust') }} >=1.65.0 + - maturin + - cargo-bundle-licenses + - xz + + # cross-compilation dependencies + - if: build_platform != target_platform + then: + - python + - cross-python_${{ target_platform }} + - crossenv + - cffi + + - if: unix + then: + - libclang + - clangdev + + host: + - python + - pip + - maturin + - toml + - cffi + + run: + - python + - screed >=1.1.2 + - cffi >=1.17.1 + - deprecation >=2.0.6 + - cachetools >=4.2.1,<5 + - numpy + - matplotlib-base + - scipy + - bitstring >=3.1.9,<4 + +tests: + - python: + imports: + - sourmash + pip_check: false + - script: + - sourmash --help + - sourmash info + +about: + summary: Compute and compare MinHash signatures for DNA data sets. + license: BSD-3-Clause + license_file: + - LICENSE + - THIRDPARTY.yml + homepage: https://github.com/sourmash-bio/sourmash + repository: https://github.com/sourmash-bio/sourmash + documentation: https://sourmash.bio/ + +extra: + recipe-maintainers: + - luizirber + - ctb + - bluegenes
linux_64_python3.10.____cpython - - variant + + variant
linux_64_python3.11.____cpython - - variant + + variant
linux_64_python3.12.____cpython - - variant + + variant
linux_64_python3.13.____cp313 - - variant + + variant
linux_aarch64_python3.10.____cpython - - variant + + variant
linux_aarch64_python3.11.____cpython - - variant + + variant
linux_aarch64_python3.12.____cpython - - variant + + variant
linux_aarch64_python3.13.____cp313 - - variant + + variant
linux_ppc64le_python3.10.____cpython - - variant + + variant
linux_ppc64le_python3.11.____cpython - - variant + + variant
linux_ppc64le_python3.12.____cpython - - variant + + variant
linux_ppc64le_python3.13.____cp313 - - variant + + variant
osx_64_python3.10.____cpython - - variant + + variant
osx_64_python3.11.____cpython - - variant + + variant
osx_64_python3.12.____cpython - - variant + + variant
osx_64_python3.13.____cp313 - - variant + + variant
osx_arm64_python3.10.____cpython - - variant + + variant
osx_arm64_python3.11.____cpython - - variant + + variant
osx_arm64_python3.12.____cpython - - variant + + variant
osx_arm64_python3.13.____cp313 - - variant + + variant
win_64_python3.10.____cpython - - variant + + variant
win_64_python3.11.____cpython - - variant + + variant
win_64_python3.12.____cpython - - variant + + variant
win_64_python3.13.____cp313 - - variant + + variant