Skip to content

Commit

Permalink
Another attempt at fixing the CI seg faults.
Browse files Browse the repository at this point in the history
  • Loading branch information
canismarko committed Nov 15, 2023
1 parent dec6071 commit 86ff10e
Show file tree
Hide file tree
Showing 5 changed files with 528 additions and 524 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ jobs:
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: pytest --timeout=120
run: pytest --timeout=120 src/firefly/tests/test_run_browser.py src/firefly/tests/test_voltmeters.py src/firefly/tests/test_xrf_detector_display.py
4 changes: 3 additions & 1 deletion src/firefly/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,13 @@ def _prepare_device_windows(self, device_label: str, attr_name: str):
# if attr_name == "ion_chamber":
# breakpoint()
for device in devices:
# Check that we don't already have actions set
# Create the window action
action = QtWidgets.QAction(self)
action.setObjectName(f"actionShow_{attr_name}_{device.name}")
action.setText(device.name)
actions[device.name] = action
# Create a slot for opening the motor window
# Create a slot for opening the device window
slot = getattr(self, f"show_{attr_name}_window")
slot = partial(slot, device=device)
action.triggered.connect(slot)
Expand Down
Loading

0 comments on commit 86ff10e

Please sign in to comment.