Skip to content

Commit

Permalink
Merge pull request #2066 from wolfv/fix-about-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
beckermr committed Sep 21, 2024
2 parents 988a4f0 + bc01e67 commit b2e094f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
12 changes: 11 additions & 1 deletion conda_smithy/configure_feedstock.py
Original file line number Diff line number Diff line change
Expand Up @@ -2082,10 +2082,20 @@ def render_readme(jinja_env, forge_config, forge_dir, render_info=None):
about = about.copy()
# if subpackages do not have about, conda-build would copy the top-level about;
# if subpackages have their own about, conda-build would use them as is;
# we discussed in PR #1691 and decided to not show repetitve entries
# we discussed in PR #1691 and decided to not show repetitive entries
if about != package_about:
subpackages_about.append((name, about))

# align new style about with old style about
print("subpackages_about", subpackages_about)
for i, (name, about) in enumerate(subpackages_about):
if "repository" in about:
about["dev_url"] = about["repository"]
if "homepage" in about:
about["home"] = about["homepage"]
if "documentation" in about:
about["doc_url"] = about["documentation"]

template = jinja_env.get_template("README.md.tmpl")
target_fname = os.path.join(forge_dir, "README.md")
forge_config["noarch_python"] = all(meta.noarch for meta in metas)
Expand Down
2 changes: 1 addition & 1 deletion conda_smithy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def get_feedstock_name_from_meta(


def get_feedstock_about_from_meta(meta) -> dict:
"""Fetch the feedtstock about from the parsed meta.yaml."""
"""Fetch the feedstock about from the parsed meta.yaml."""
# it turns out that conda_build would not preserve the feedstock about:
# - if a subpackage does not have about, it uses the feedstock's
# - if a subpackage has about, it's used as is
Expand Down

0 comments on commit b2e094f

Please sign in to comment.