Skip to content

Commit

Permalink
Merge pull request #2144 from conda-forge/more-noarch-py-bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
beckermr authored Nov 20, 2024
2 parents ab19303 + 7e3ea63 commit 26c49c5
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
13 changes: 11 additions & 2 deletions conda_smithy/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
import conda_smithy.cirun_utils
from conda_smithy import __version__, configure_feedstock, feedstock_io
from conda_smithy import lint_recipe as linter
from conda_smithy.configure_feedstock import _load_forge_config
from conda_smithy.configure_feedstock import (
_load_forge_config,
get_cached_cfp_file_path,
)
from conda_smithy.utils import (
CONDA_BUILD,
RATTLER_BUILD,
Expand Down Expand Up @@ -333,7 +336,13 @@ def __call__(self, args):
# Load the conda-forge config and read metadata from the feedstock recipe
forge_config = _load_forge_config(args.feedstock_directory, None)
metadata = _get_metadata_from_feedstock_dir(
args.feedstock_directory, forge_config
args.feedstock_directory,
forge_config,
conda_forge_pinning_file=(
get_cached_cfp_file_path(".")[0]
if args.user is None and args.organization == "conda-forge"
else None
),
)

feedstock_name = get_feedstock_name_from_meta(metadata)
Expand Down
23 changes: 23 additions & 0 deletions news/2144-noarch-py-min.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* Fixed a bug where the ``register-ci`` command fails for recipes with the ``python_min`` variable being used. (#2144)

**Security:**

* <news item>

0 comments on commit 26c49c5

Please sign in to comment.