Skip to content

Commit

Permalink
Merge pull request #1847 from h-vetinari/boost
Browse files Browse the repository at this point in the history
Boost piggyback follow-up
  • Loading branch information
h-vetinari authored Sep 29, 2023
2 parents b54a19f + d55ff7c commit 4200230
Show file tree
Hide file tree
Showing 4 changed files with 885 additions and 3 deletions.
6 changes: 3 additions & 3 deletions conda_forge_tick/migrators/libboost.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ def _process_section(name, attrs, lines):
host_req = reqs.get("host", set()) or set()
run_req = reqs.get("run", set()) or set()

is_boost_in_build = "boost-cpp" in build_req
is_boost_in_host = "boost-cpp" in host_req
is_boost_in_run = "boost-cpp" in run_req
is_boost_in_build = any((x or "").startswith("boost-cpp") for x in build_req)
is_boost_in_host = any((x or "").startswith("boost-cpp") for x in host_req)
is_boost_in_run = any((x or "").startswith("boost-cpp") for x in run_req)

# anything behind a comment needs to get replaced first, so it
# doesn't mess up the counts below
Expand Down
2 changes: 2 additions & 0 deletions tests/test_libboost.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
("gudhi", "1.10.0"),
# single output; with run-dep
("carve", "1.10.0"),
# multiple output; no run-dep
("arrow", "1.10.0"),
# multiple outputs, many don't depend on boost; comment trickiness
("fenics", "1.10.0"),
# multiple outputs, jinja-style pinning
Expand Down
Loading

0 comments on commit 4200230

Please sign in to comment.