Repository navigation
Merge the six PRs whose conflicts were registry-level - #241
Merged
Merged
Conversation
find_all crashed on a missing author key; year now goes through year().
# Conflicts: # blueprint/src/python/tests/test_region.py
# Conflicts: # blueprint/src/python/tests/test_all.py
# Conflicts: # blueprint/src/python/tests/test_all.py
# Conflicts: # blueprint/src/python/hypotheses.py # blueprint/src/python/tests/test_all.py
# Conflicts: # blueprint/src/python/exponent_pair.py # blueprint/src/python/tests/test_exppair.py
# Conflicts: # blueprint/src/python/tests/test_all.py
Merging the exponent-pair hull work with the cache-isolation work left two places needing a real resolution rather than a union of both sides. compute_convex_hull kept both cache writes, and returned the one still built from a bare ConvexHull call — which defeated the point of computing point and segment hulls separately. Keep the isolated 'exponent_pair_convex_hull' key and populate it with _convex_hull_vertices, so the hull is both cached under its own key and robust to collinear input. Hypothesis_Set.__copy__ ended up copying .data twice, in two equivalent ways; keep one. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges #217, #226, #228, #231, #234 and #235, which could not be merged individually because they conflicted with each other rather than with
main.Most of the conflicts were registry-level — several PRs each append an
import test_…line totests/test_all.py, or append a test function totests/test_region.py/tests/test_exppair.py. Those are resolved by keeping both sides.Two needed an actual decision:
exponent_pair.compute_convex_hull— Keep exponent-pair and mu hull caches independent #231 renames the cache key toexponent_pair_convex_hullso the exponent-pair and mu hull caches stop colliding, while Compute collinear exponent-pair hulls without Qhull errors #234 replaces the bareConvexHullcall with_convex_hull_verticesto handle point and segment hulls that Qhull rejects. Taking both sides literally kept both cache writes and returned the one still built from the bareConvexHull, silently discarding Compute collinear exponent-pair hulls without Qhull errors #234's fix. Resolved by caching_convex_hull_vertices(pairs)under Keep exponent-pair and mu hull caches independent #231's isolated key, which is what each PR was individually after.Hypothesis_Set.__copy__— both PRs independently fixed the same shallow-copy bug, one withdict(self.data)and one withself.data.copy(). These are equivalent; kept one.🤖 Generated with Claude Code