Replace references to blueapi messaging package #589

callumforrester · 2024-08-06T15:09:16Z

Replace references to blueapi messaging package with references to the bluesky stomp library

Fixes #588

…e bluesky stomp library

codecov · 2024-08-22T11:54:19Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.52%. Comparing base (caf7e46) to head (7437ea5).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #589      +/-   ##
==========================================
- Coverage   92.99%   92.52%   -0.47%     
==========================================
  Files          40       35       -5     
  Lines        1826     1633     -193     
==========================================
- Hits         1698     1511     -187     
+ Misses        128      122       -6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

.github/actions/install_requirements/action.yml

dev-requirements.txt

tests/client/test_client.py

stan-dot

small readability and naming suggestions

pyproject.toml

src/blueapi/cli/cli.py

src/blueapi/client/event_bus.py

src/blueapi/service/interface.py

tests/core/fake_device_module.py

tests/service/test_interface.py

pyproject.toml

src/blueapi/client/event_bus.py

src/blueapi/service/interface.py

callumforrester · 2024-08-30T12:17:15Z

tests/conftest.py

-
-
-def pytest_collection_modifyitems(config, items):
- if config.getoption("--skip-stomp"):


Now that we've removed this, we no longer need any special handling for STOMP in CI, can you remove the parts of the github actions that start up activemq and rabbitmq?

There are 2 tests that are used to connect to the activemq/rabbitmq...I could delete them or skip both I don't think are suitable ..

callumforrester · 2024-09-02T10:50:09Z

@ZohebShaikh Would you be able to write some tests that cover the affected area? See https://app.codecov.io/gh/DiamondLightSource/blueapi/pull/589?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=checks&utm_campaign=pr+comments&utm_term=DiamondLightSource

.github/workflows/_test.yml

src/blueapi/service/interface.py

docs/reference/openapi.yaml

DiamondJoseph

LGTM!

Allow merge while Stan is on leave

callumforrester and others added 3 commits August 6, 2024 16:31

Replace references to blueapi messaging package with references to th…

017b3ae

…e bluesky stomp library

Handle connect exception in blueapi

cbcac76

Merge remote-tracking branch 'origin/main' into 588_remove_messaging

5dded50

ZohebShaikh force-pushed the 588_remove_messaging branch 2 times, most recently from 485c4b6 to 1115b91 Compare August 22, 2024 11:50

ZohebShaikh force-pushed the 588_remove_messaging branch 3 times, most recently from e074005 to c2a4483 Compare August 23, 2024 13:13

updated to use bluesky-stomp

bce8081

ZohebShaikh force-pushed the 588_remove_messaging branch from c2a4483 to bce8081 Compare August 23, 2024 13:24

updated ci to working command

53ea6ff

ZohebShaikh force-pushed the 588_remove_messaging branch from dbdf9f4 to 53ea6ff Compare August 23, 2024 13:36

ZohebShaikh reviewed Aug 23, 2024

View reviewed changes

.github/actions/install_requirements/action.yml Outdated Show resolved Hide resolved

ZohebShaikh reviewed Aug 23, 2024

View reviewed changes

dev-requirements.txt Outdated Show resolved Hide resolved

ZohebShaikh added 4 commits August 23, 2024 13:56

change signature of subscribe callback

c611740

added auth to the broker constructor

1dc116c

update test and runner

c916777

stop gap commit will be removed

8e0410f

ZohebShaikh requested review from DiamondJoseph and stan-dot August 27, 2024 13:42

ZohebShaikh reviewed Aug 27, 2024

View reviewed changes

tests/client/test_client.py Show resolved Hide resolved

ZohebShaikh marked this pull request as ready for review August 27, 2024 13:49

ZohebShaikh force-pushed the 588_remove_messaging branch from 4e85983 to 3f2b147 Compare August 28, 2024 09:03

stan-dot previously requested changes Aug 28, 2024

View reviewed changes

DiamondJoseph requested changes Aug 28, 2024

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

pyproject.toml Outdated Show resolved Hide resolved

src/blueapi/client/event_bus.py Outdated Show resolved Hide resolved

src/blueapi/service/interface.py Outdated Show resolved Hide resolved

code review changes

258c149

ZohebShaikh force-pushed the 588_remove_messaging branch from 3f2b147 to 258c149 Compare August 28, 2024 09:33

docker container change

594c1dc

ZohebShaikh force-pushed the 588_remove_messaging branch from fe75ae6 to 594c1dc Compare August 28, 2024 15:33

ZohebShaikh force-pushed the 588_remove_messaging branch from bf187f0 to bdaf11f Compare August 29, 2024 15:32

added code review changes

ec685d1

ZohebShaikh force-pushed the 588_remove_messaging branch from bdaf11f to ec685d1 Compare August 29, 2024 15:42

ZohebShaikh requested a review from DiamondJoseph August 29, 2024 17:49

callumforrester commented Aug 30, 2024

View reviewed changes

ZohebShaikh added 3 commits August 30, 2024 14:25

removed activemq and rabbitmq from

db6dcd2

Merge branch 'main' into 588_remove_messaging

8a579e7

delete stomp test

b820c13

ZohebShaikh added 3 commits September 2, 2024 12:17

added stomp test

ed41e6e

added rabbitmq to CI

cfba6ed

fixed typo

d3ab4e7

ZohebShaikh force-pushed the 588_remove_messaging branch from d4a67f5 to d3ab4e7 Compare September 2, 2024 11:55

callumforrester commented Sep 3, 2024

View reviewed changes

.github/workflows/_test.yml Outdated Show resolved Hide resolved

ZohebShaikh added 3 commits September 3, 2024 10:15

added mock connection

8e45cff

Merge remote-tracking branch 'origin/main' into 588_remove_messaging

84b76cd

changed patch

3d2d53b

ZohebShaikh force-pushed the 588_remove_messaging branch from 8dd1209 to 29342df Compare September 3, 2024 11:54

ZohebShaikh mentioned this pull request Sep 3, 2024

Add system tests #611

Closed

added mock test for interface

9932702

ZohebShaikh force-pushed the 588_remove_messaging branch from 29342df to 9932702 Compare September 5, 2024 09:50

DiamondJoseph requested changes Sep 5, 2024

View reviewed changes

src/blueapi/service/interface.py Outdated Show resolved Hide resolved

docs/reference/openapi.yaml Outdated Show resolved Hide resolved

ZohebShaikh force-pushed the 588_remove_messaging branch from e8ec5ce to 42a295f Compare September 5, 2024 10:22

made openapi yaml changes

7437ea5

ZohebShaikh force-pushed the 588_remove_messaging branch from 42a295f to 7437ea5 Compare September 5, 2024 10:30

ZohebShaikh requested a review from DiamondJoseph September 5, 2024 10:43

DiamondJoseph approved these changes Sep 5, 2024

View reviewed changes

ZohebShaikh merged commit 012238d into main Sep 5, 2024
24 checks passed

ZohebShaikh deleted the 588_remove_messaging branch September 5, 2024 10:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace references to blueapi messaging package #589

Replace references to blueapi messaging package #589

callumforrester commented Aug 6, 2024

codecov bot commented Aug 22, 2024 •

edited

Loading

stan-dot left a comment

callumforrester Aug 30, 2024

ZohebShaikh Aug 30, 2024

callumforrester commented Sep 2, 2024

DiamondJoseph left a comment



		def pytest_collection_modifyitems(config, items):
		if config.getoption("--skip-stomp"):

Replace references to blueapi messaging package #589

Replace references to blueapi messaging package #589

Conversation

callumforrester commented Aug 6, 2024

codecov bot commented Aug 22, 2024 • edited Loading

Codecov Report

stan-dot left a comment

Choose a reason for hiding this comment

callumforrester Aug 30, 2024

Choose a reason for hiding this comment

ZohebShaikh Aug 30, 2024

Choose a reason for hiding this comment

callumforrester commented Sep 2, 2024

DiamondJoseph left a comment

Choose a reason for hiding this comment

codecov bot commented Aug 22, 2024 •

edited

Loading