From a5a973a2eef065e8c7832894e306791a68c80b80 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 10 Oct 2024 09:20:15 -0700 Subject: [PATCH 1/5] don't use mingw for windows build --- recipe/meta.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cb81dbf..35259ea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,11 +22,9 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - crossenv # [build_platform != target_platform] - cffi # [build_platform != target_platform] - - {{ compiler('c') }} # [not win] - - {{ stdlib("c") }} # [not win] - - {{ compiler('cxx') }} # [not win] - - {{ compiler('m2w64_c') }} # [win] - - {{ stdlib("m2w64_c") }} # [win] + - {{ compiler('c') }} + - {{ stdlib("c") }} + - {{ compiler('cxx') }} - {{ compiler('rust') }} >=1.65.0 - maturin - cargo-bundle-licenses From f4cebce2f1e821721b9f7b062ece1d42b3cf7017 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 10 Oct 2024 09:29:00 -0700 Subject: [PATCH 2/5] rerender --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .../linux_64_python3.10.____cpython.yaml | 2 - .../linux_64_python3.11.____cpython.yaml | 2 - .../linux_64_python3.12.____cpython.yaml | 2 - .../linux_64_python3.13.____cp313.yaml | 4 +- .../linux_aarch64_python3.10.____cpython.yaml | 2 - .../linux_aarch64_python3.11.____cpython.yaml | 2 - .../linux_aarch64_python3.12.____cpython.yaml | 2 - .../linux_aarch64_python3.13.____cp313.yaml | 4 +- .../linux_ppc64le_python3.10.____cpython.yaml | 2 - .../linux_ppc64le_python3.11.____cpython.yaml | 2 - .../linux_ppc64le_python3.12.____cpython.yaml | 2 - .../linux_ppc64le_python3.13.____cp313.yaml | 4 +- .../osx_64_python3.10.____cpython.yaml | 2 - .../osx_64_python3.11.____cpython.yaml | 2 - .../osx_64_python3.12.____cpython.yaml | 2 - .ci_support/osx_64_python3.13.____cp313.yaml | 4 +- .../osx_arm64_python3.10.____cpython.yaml | 2 - .../osx_arm64_python3.11.____cpython.yaml | 2 - .../osx_arm64_python3.12.____cpython.yaml | 2 - .../osx_arm64_python3.13.____cp313.yaml | 4 +- .../win_64_python3.10.____cpython.yaml | 13 ++- .../win_64_python3.11.____cpython.yaml | 13 ++- .../win_64_python3.12.____cpython.yaml | 13 ++- .ci_support/win_64_python3.13.____cp313.yaml | 15 ++- README.md | 102 +++++++++--------- azure-pipelines.yml | 34 +++++- 27 files changed, 112 insertions(+), 130 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 810ac83..3c03f25 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 6fa9992..880259b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index eedcd57..a91a708 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index f8348b7..014be6e 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml index bf09c9c..eb3df72 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index dea2ed4..82d6aa9 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -39,5 +39,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index b3ca108..715ee2d 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -39,5 +39,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 50b7099..b8f3a8d 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -39,5 +39,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml index c61e2cd..3d9e309 100644 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -39,5 +39,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index ee63954..e079dd2 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index a14c7bf..aba45dd 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 9ef3bb8..d13e6aa 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml index 4f660df..8490161 100644 --- a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,5 +35,3 @@ zip_keys: - cxx_compiler_version - - c_stdlib_version - cdt_name -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 3d0069d..19ecc2e 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index c54fdb5..eaac340 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index dc5da4c..a1a1802 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 64cd665..33e89c2 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.14' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 76beb1a..7d573f3 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 2b33abd..ab57414 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 2db9365..8f3ed73 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index 27f03ed..b497b1a 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -35,5 +35,3 @@ xz: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index cd6cb7e..f671b27 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -1,11 +1,13 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main -m2w64_c_compiler: -- m2w64-toolchain -m2w64_c_stdlib: -- m2w64-toolchain +cxx_compiler: +- vs2019 pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,3 @@ target_platform: - win-64 xz: - '5' -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index fd7cf36..7d5f1d0 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -1,11 +1,13 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main -m2w64_c_compiler: -- m2w64-toolchain -m2w64_c_stdlib: -- m2w64-toolchain +cxx_compiler: +- vs2019 pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,3 @@ target_platform: - win-64 xz: - '5' -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index dff582c..a1608da 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,11 +1,13 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main -m2w64_c_compiler: -- m2w64-toolchain -m2w64_c_stdlib: -- m2w64-toolchain +cxx_compiler: +- vs2019 pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,3 @@ target_platform: - win-64 xz: - '5' -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml index 9225763..a39e992 100644 --- a/.ci_support/win_64_python3.13.____cp313.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -1,11 +1,13 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main -m2w64_c_compiler: -- m2w64-toolchain -m2w64_c_stdlib: -- m2w64-toolchain +cxx_compiler: +- vs2019 pin_run_as_build: python: min_pin: x.x @@ -18,6 +20,3 @@ target_platform: - win-64 xz: - '5' -zip_keys: -- - python - - channel_sources diff --git a/README.md b/README.md index 188e17a..45ab97c 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/sourmash-minimal-feedstock/blob/main/LICENSE.txt) +Feedstock license: [BSD-3-Clause](/~https://github.com/conda-forge/win_build-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 e5306da..579bd76 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,33 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 822164b9b1ca6b19a776d45d8bababf451001f01 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 10 Oct 2024 09:31:45 -0700 Subject: [PATCH 3/5] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 35259ea..ce280c3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: build: entry_points: - sourmash = sourmash.__main__:main - number: 1 + number: 2 missing_dso_whitelist: # [osx] - /usr/lib/libresolv.9.dylib # [osx] skip: true # [py<310] From 7b44eec3a2d006aeb1ddd43cb4d57d7196cde0d0 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 10 Oct 2024 09:36:51 -0700 Subject: [PATCH 4/5] clean up linter warnings --- recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ce280c3..f715b65 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,9 +48,6 @@ requirements: - matplotlib-base - scipy - bitstring >=3.1.9,<4 - - libstdcxx-ng # [linux] - - libgcc-ng # [linux] - # Due to rocksDB: https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk test: imports: From 6f2ea149312c87f3c6113564abc74bda033ae510 Mon Sep 17 00:00:00 2001 From: Luiz Irber Date: Thu, 10 Oct 2024 10:27:09 -0700 Subject: [PATCH 5/5] require cffi supporting Python 3.13 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f715b65..0f9eb9d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ requirements: run: - python - screed >=1.1.2 - - cffi >=1.14 + - cffi >=1.17.1 - deprecation >=2.0.6 - cachetools >=4.2.1,<5 - numpy
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