-
Notifications
You must be signed in to change notification settings - Fork 178
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
chore: Merge chore_release-7.2.0 into edge #14495
Conversation
Fix empty card styling for instrument cards and border radius for instrument and module cards closes RQA-2262
* chore: use api tokens for pypi deploys * enforce latest pip * perhaps latest pipenv
When we parse python protocols, we were doing it by (1) making it into a string with decode('utf-8') and then (2) passing the string ast.parse(). The problem with this is that decode('utf-8') does not apply "universal newlines", which means that the code object created by compiling the ast will have line numbers that are around twice what they should be under certain circumstances (windows machine, crlf file, mercury in the seventh house, etc). Then, when we go and display a nice error message about a syntax error or whatever, the user says "why is this error message pointing to a place past the end of my protocol". This should fix that by keeping the protocol contents in bytes form all the way through to passing ast.parse() a bytes that _has never been through str.decode('utf-8')_ which should preserve everything.
) Closes RQA-2291, RQA-2307, RQA-2306, RQA-2304 * fix(app): fix non polling notify hooks not always refetching data appropriately Instead of checking the refetchInterval property to see if a notification refetch should occur, we should check if staleTime is infinity. This accurately captures the refetchHTTP behavior that we actually want. * fix(app): fix infinite cancelling run state when run status is idle->stop-requested
…nce snapshot tests (#14466)
* refactor(app): add robot serial number to mixpanel analytics closes RAUT-899
* docs: update nodejs version in the doc
toggles between slightly different greens and purples based on window.matchMedia matching to the touchscreen height and width closes RAUT-966
…/runs/:runId/setup (#14486) Closes RQA-2290 Notification changes uncovered a bug in which a RecentRunProtocolCard caused redirection to the /runs/:runId/setup page before the actual run had loaded, which caused the TopLevelRedirect hook to bounce back to the /protocols page until the run loads. Instead of relying on run within TopLevelRedirect for this one off route case, move the redirect within ProtocolSetup and redirect if run status is stopped. This creates the same end behavior without the temporary redirect to /protocols.
…ns (#14477) Closes RQA-2339, RQA-2321, RQA-2319, RAUT-962, RQA-2346 * fix(app-shell, app-shell-odd): fix intermittently dropped notifications Because subscription logic is directly tied to the component lifecycle, it is possible for a component to trigger an unsubscribe event on dismount while a new component mounts and triggers a subscribe event. For the connection store and MQTT to reflect correct topic subscriptions, do not unsubscribe and close connections before newly mounted components have had time to update the connection store.
Closes RQA-2296 The staleTime property was not handled correctly by the useNotifyService notification hook. In addition to disabling notifications when using staleTime, we must also alert the HTTP hook that it is responsible for refetching HTTP data.
…cols/__init__.py (#14480)
Resolve conflicts in Makefile.
Reminder to self to normal-merge this, not squash. |
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## edge #14495 +/- ##
==========================================
- Coverage 67.79% 67.78% -0.01%
==========================================
Files 2518 2517 -1
Lines 72004 72044 +40
Branches 9244 9274 +30
==========================================
+ Hits 48815 48838 +23
- Misses 20987 20991 +4
- Partials 2202 2215 +13
Flags with carried forward coverage won't be shown. Click here to find out more.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Please remember to normal merge!
Overview
This is an incremental merge of the in-progress
chore_release-7.2.0
branch intoedge
.We had to make a synchronized change between this repo's
chore_release-7.2.0
branch and Opentrons/oe-core'smain
branch. (PRs #14480 and Opentrons/oe-core#134.)So, we also need to synchronize this repo's
edge
branch. Otherwise, builds with this repo'sedge
and Opentrons/oe-core'smain
— which is most of them — will be broken because this repo'sedge
is missing the change.Test Plan
Changelog
Resolve one merge conflict in the top-level Makefile, between #14464 (added
pip install --upgrade pip
and bumped the Pipenv version) and #14469 (moved that Makefile bit to a separate recipe).Review requests
Is my premise about our automatic builds correct?
Risk assessment
Low.