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.

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

merge from upstream main #224

Merged
merged 2 commits into from
Jan 10, 2025
Merged

merge from upstream main #224

merged 2 commits into from
Jan 10, 2025

Conversation

eli-bl
Copy link

@eli-bl eli-bl commented Jan 7, 2025

This change is only for Benchling's internal use of the package. It merges changes from upstream main to our prod/2.x fork, bringing us to parity with all upstream fixes and new features so far. (This does not mean our fork is now the same as main - there are still areas where we have deliberately made changes for our own use, like removing pdm, plus fixes/features in our fork that have not been accepted to main, like the functional tests.)

The following upstream PRs are included:

Many other changes in the diff are simply replacements of Dict[T], List[T], etc. with dict[T], list[T], etc. as a style change due to dropping Python 3.8.

@eli-bl eli-bl requested review from edwin-benchling and removed request for damola-benchling January 8, 2025 18:14
@eli-bl eli-bl marked this pull request as ready for review January 8, 2025 18:15
@eli-bl
Copy link
Author

eli-bl commented Jan 10, 2025

@edwin-benchling For what it's worth, I think it's probably not worthwhile to try to read through the diff in detail or compare it to the original PRs. There are going to be more of these PRs since the upstream project is actively (if slowly) maintained, and they're all going to look like this: very similar to the original PRs, but never identical because there is still divergence on our fork.

The project has guaranteed 100% test coverage, so the tests are evidence that the merge is valid.

@eli-bl eli-bl merged commit 082fd18 into prod/2.x Jan 10, 2025
18 checks passed
@eli-bl eli-bl deleted the merge-upstream branch January 10, 2025 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants