Skip to content

Commit

Permalink
Merge pull request #10 from jdblischak/rerender
Browse files Browse the repository at this point in the history
Rerender to modernize feedstock
  • Loading branch information
jdblischak committed Dec 6, 2023
2 parents 4883319 + 8f230bb commit bd0d62c
Show file tree
Hide file tree
Showing 27 changed files with 63 additions and 44 deletions.
8 changes: 3 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl7libdeflate1.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl7libdeflate1.13.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl7libdeflate1.14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl7libdeflate1.16.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl7libdeflate1.17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl8libdeflate1.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl8libdeflate1.13.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl8libdeflate1.14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl8libdeflate1.16.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_libcurl8libdeflate1.17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl7libdeflate1.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl7libdeflate1.13.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl7libdeflate1.14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl7libdeflate1.16.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl7libdeflate1.17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl8libdeflate1.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl8libdeflate1.13.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl8libdeflate1.14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl8libdeflate1.16.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_libcurl8libdeflate1.17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand Down
20 changes: 14 additions & 6 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 17 additions & 10 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package:
version: {{ version }}

build:
number: 5
number: 6
run_exports:
- {{ pin_subpackage('htslib', max_pin='x.x') }}

Expand Down

0 comments on commit bd0d62c

Please sign in to comment.