Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 1.16 and remove unnecessary pinning #7

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Update to 1.16 and remove unnecessary pinning #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a3450
Update to 1.16 and remove unnecessary pinning
jdblischak Jan 4, 2024
9b2bc98
MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.2, and co…
jdblischak Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 13 additions & 70 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

14 changes: 12 additions & 2 deletions .gitignore
View file
Open in desktop

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

80 changes: 0 additions & 80 deletions .scripts/create_conda_build_artifacts.bat
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh
View file
Open in desktop

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

118 changes: 118 additions & 0 deletions .scripts/run_win_build.bat
View file
Open in desktop

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

8 changes: 0 additions & 8 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
# https://github.com/bioconda/bioconda-utils/blob/28a4dda0257b436d881da7717a88d75d6bf3067e/bioconda_utils/bioconda_utils-conda_build_config.yaml
pin_run_as_build:
m2w64-htslib:
max_pin: x.x
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pin_run_as_build and run_exports are different mechanisms for achieving the same result, ie pinning the runtime dependency to use the same version at build time. This recipe already uses run_exports, so also including pin_run_as_build is redundant. Also, conda-forge has decided to prefer run_exports over pin_run_as_build

Note that bioconda continues to include htslib in its pin_run_as_build in conda_build_config.yaml.

https://github.com/bioconda/bioconda-utils/blob/8255afdd9e5c0fd3cb09cb11269f5ff3397c959e/bioconda_utils/bioconda_utils-conda_build_config.yaml#L15

However, that is a different situation. Their conda_build_config.yaml is applied when building any bioconda recipe, whereas the one in this feedstock is only applied for building this recipe. Thus if a bioconda recipe is for some reason built against a very old htslib that doesn't have run_exports, it would still be pinned properly at runtime


m2w64_htslib:
- 1.15.1
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unnecessary for various reasons.

First, as above, this conda_build_config.yaml is only applied when building the recipe in this feedstock. My original motivation for including this was to match the upstream bioconda conda_build_config.yaml, but I now realize that this wasn't achieving the same goal. Since it only applies to this recipe, it only pins it for this recipe, and is thus just an additional place where we need to manually bump the version.

Second, bioconda no longer pins htslib globally (bioconda/bioconda-utils#917) since it has relaxed the htslib pins for all existing recipes (bioconda/bioconda-recipes#42895)


channel_sources:
- conda-forge

Expand Down
6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "1.15.1" %}
{% set release = "1" %}
{% set sha256 = "e18754d4e2c9cd385c26b84b232f602021083147e3b93d6e35ce9071e943e81f" %}
{% set version = "1.16" %}
{% set release = "0" %}
{% set sha256 = "ac6a03e561eba22b9de0fd93e6b3d5aea0c72a5981e6a8157a24c8799bd3a8aa" %}
{% set so = "3" %}

package:
Expand Down