Sc336/2.7.0 master merge#2041
Merged
Merged
Conversation
* Various docstring improvements * Added and improved some comments * Formatting changes * Added myself as new contributor * Edits made based on review from st--
* Updated to ignore mypy's new type-abstract error * Looks like mypy won't quit on this one. * More type hinting * Sort * Another try * Another try * Another try * Go away mypy * format * More mypy wards * Is this error connected? * Removed unnecessary dummy package * Another mypy error * Format
* Avoid loss of precision in to_default_float when input is a python float (#2021) * avoid loss of precision in to_default_float * add tests * release management * Updated to compensate for new mypy version (#2016) * Updated to ignore mypy's new type-abstract error * Looks like mypy won't quit on this one. * More type hinting * Sort * Another try * Another try * Another try * Go away mypy * format * More mypy wards * Is this error connected? * Removed unnecessary dummy package * Another mypy error * Format * Fix mypy error. (#2009) Co-authored-by: sc336 <[email protected]> Co-authored-by: Jesper Nielsen <[email protected]> * Some corrections to RELEASE.md (#2022) * Update VERSION * Update version Co-authored-by: John Mcleod <[email protected]> Co-authored-by: Jesper Nielsen <[email protected]> Co-authored-by: Chris Morter <[email protected]>
* Add usage of monitoring with Adam to notebook * Add self to contributors * Update release notes * Update doc/sphinx/notebooks/getting_started/monitoring.pct.py Co-authored-by: st-- <[email protected]> * Run make format Co-authored-by: st-- <[email protected]>
* Rotated deploy key due to CircleCI security incident 2023-01-04 * Used the correct key this time * Touched to force rerunning tests
… (#2033) * Rotated deploy key due to CircleCI security incident 2023-01-04 Updated config with new key
* Release update
Squash merge master into develop. Co-authored-by: sc336 <[email protected]> Co-authored-by: Jesper Nielsen <[email protected]> Co-authored-by: John Mcleod <[email protected]> Co-authored-by: Jesper Nielsen <[email protected]> Co-authored-by: Chris Morter <[email protected]>
* Merge master into develop (via sc336/2.7.0-merge) Co-authored-by: sc336 <[email protected]> Co-authored-by: John Mcleod <[email protected]> Co-authored-by: Jesper Nielsen <[email protected]> Co-authored-by: Chris Morter <[email protected]>
uri-granta
approved these changes
Jan 24, 2023
Codecov ReportBase: 98.27% // Head: 98.01% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #2041 +/- ##
==========================================
- Coverage 98.27% 98.01% -0.26%
==========================================
Files 108 96 -12
Lines 6551 5401 -1150
==========================================
- Hits 6438 5294 -1144
+ Misses 113 107 -6
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
Member
|
I think the issue might have happened by squash-merging develop into master in a previous release. Or something like that. I remember squashing/rebasing commits on one of the branches during a merge was the issue... |
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
5 participants
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.
After some frustration trying to merge develop into master while both are protected, this merges in a new branch (sc336/2.7.0-master-merge-again) which is created from develop and has master merged into it.