Skip to content

Commit e289cb3

Browse files
evvaaaaevvaaaa
committed
Added a wait on test_bobfiles_created
to allow bobfiles time to be written in the subprocess. Changed to pvi>=0.5 and python>=3.10
1 parent 9c88dae commit e289cb3

File tree

9 files changed

+55
-530
lines changed

9 files changed

+55
-530
lines changed

Diff for: ‎.github/workflows/code.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
os: ["ubuntu-latest"] # can add windows-latest, macos-latest
36-
python: ["3.9", "3.10"] # Disable 3.11 until this is fixed:https://github.com/PandABlocks/PandABlocks-client/issues/47
36+
python: ["3.10", "3.11"]
3737
install: ["-e .[dev]"]
3838
# Make one version be non-editable to test both paths of version code
3939
include:
4040
- os: "ubuntu-latest"
41-
python: "3.8"
41+
python: "3.10"
4242
install: ".[dev]"
4343

4444
runs-on: ${{ matrix.os }}

Diff for: ‎pyproject.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ name = "PandABlocks-ioc"
77
classifiers = [
88
"Development Status :: 3 - Alpha",
99
"License :: OSI Approved :: Apache Software License",
10-
"Programming Language :: Python :: 3.8",
11-
"Programming Language :: Python :: 3.9",
1210
"Programming Language :: Python :: 3.10",
1311
"Programming Language :: Python :: 3.11",
1412
]
@@ -20,7 +18,7 @@ dependencies = [
2018
"h5py",
2119
"softioc>=4.3.0",
2220
"pandablocks>=0.3.1",
23-
"pvi[cli]<0.5",
21+
"pvi>=0.5",
2422
] # Add project dependencies here, e.g. ["click", "numpy"]
2523
dynamic = ["version"]
2624
license.file = "LICENSE"

Diff for: ‎tests/fixtures/mocked_panda.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# Use the unique TEST_PREFIX to ensure this isn't a problem for future tests
5050
TEST_PREFIX = "TEST-PREFIX-" + str(uuid4())[:4].upper()
5151
BOBFILE_DIR = Path(__file__).parent.parent / "test-bobfiles"
52-
TIMEOUT = 10
52+
TIMEOUT = 1000
5353

5454

5555
@pytest_asyncio.fixture
@@ -538,7 +538,6 @@ def mocked_panda_standard_responses(
538538
table_fields,
539539
) -> Generator[Tuple[Path, Connection, ResponseHandler, Queue], None, None]:
540540
response_handler = ResponseHandler(standard_responses)
541-
print(tmp_path)
542541

543542
yield from create_subprocess_ioc_and_responses(
544543
response_handler,

Diff for: ‎tests/test-bobfiles/PCAP1.bob

+10-93
Original file line numberDiff line numberDiff line change
@@ -2,110 +2,27 @@
22
<name>Display</name>
33
<x>0</x>
44
<y>0</y>
5-
<width>426</width>
6-
<height>202</height>
5+
<width>10</width>
6+
<height>35</height>
7+
<grid_step_x>4</grid_step_x>
8+
<grid_step_y>4</grid_step_y>
79
<widget type="label" version="2.0.0">
810
<name>Title</name>
911
<class>TITLE</class>
1012
<text>PCAP1 - TEST-PREFIX:</text>
1113
<x use_class="true">0</x>
1214
<y use_class="true">0</y>
13-
<width>426</width>
15+
<width>10</width>
1416
<height>25</height>
1517
<font use_class="true">
1618
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
1719
</font>
1820
</font>
21+
<foreground_color use_class="true">
22+
<color name="Text" red="0" green="0" blue="0">
23+
</color>
24+
</foreground_color>
1925
<transparent use_class="true">true</transparent>
2026
<horizontal_alignment>1</horizontal_alignment>
2127
</widget>
22-
<widget type="label" version="2.0.0">
23-
<name>Label</name>
24-
<text>PCAP1: LABEL</text>
25-
<x>23</x>
26-
<y>30</y>
27-
<width>250</width>
28-
<height>20</height>
29-
</widget>
30-
<widget type="textupdate" version="2.0.0">
31-
<name>TextUpdate</name>
32-
<pv_name>TEST-PREFIX:PCAP1:LABEL</pv_name>
33-
<x>278</x>
34-
<y>30</y>
35-
<width>125</width>
36-
<height>20</height>
37-
<font>
38-
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
39-
</font>
40-
</font>
41-
<horizontal_alignment>1</horizontal_alignment>
42-
</widget>
43-
<widget type="group" version="2.0.0">
44-
<name>PARAMETERS</name>
45-
<x>5</x>
46-
<y>55</y>
47-
<width>416</width>
48-
<height>56</height>
49-
<transparent>true</transparent>
50-
<widget type="label" version="2.0.0">
51-
<name>Label</name>
52-
<text>PCAP1: TRIG_ EDGE</text>
53-
<x>0</x>
54-
<y>0</y>
55-
<width>250</width>
56-
<height>20</height>
57-
</widget>
58-
<widget type="combo" version="2.0.0">
59-
<name>ComboBox</name>
60-
<pv_name>TEST-PREFIX:PCAP1:TRIG_EDGE</pv_name>
61-
<x>255</x>
62-
<y>0</y>
63-
<width>125</width>
64-
<height>20</height>
65-
</widget>
66-
</widget>
67-
<widget type="group" version="2.0.0">
68-
<name>INPUTS</name>
69-
<x>5</x>
70-
<y>116</y>
71-
<width>416</width>
72-
<height>81</height>
73-
<transparent>true</transparent>
74-
<widget type="label" version="2.0.0">
75-
<name>Label</name>
76-
<text>PCAP1: GATE</text>
77-
<x>0</x>
78-
<y>0</y>
79-
<width>250</width>
80-
<height>20</height>
81-
</widget>
82-
<widget type="textentry" version="3.0.0">
83-
<name>TextEntry</name>
84-
<pv_name>TEST-PREFIX:PCAP1:GATE</pv_name>
85-
<x>255</x>
86-
<y>0</y>
87-
<width>125</width>
88-
<height>20</height>
89-
<horizontal_alignment>1</horizontal_alignment>
90-
</widget>
91-
<widget type="label" version="2.0.0">
92-
<name>Label</name>
93-
<text>PCAP1: GATE: DELAY</text>
94-
<x>0</x>
95-
<y>25</y>
96-
<width>250</width>
97-
<height>20</height>
98-
</widget>
99-
<widget type="textentry" version="3.0.0">
100-
<name>TextEntry</name>
101-
<pv_name>TEST-PREFIX:PCAP1:GATE:DELAY</pv_name>
102-
<x>255</x>
103-
<y>25</y>
104-
<width>125</width>
105-
<height>20</height>
106-
<horizontal_alignment>1</horizontal_alignment>
107-
</widget>
108-
</widget>
109-
<grid_step_x>4</grid_step_x>
110-
<grid_step_y>4</grid_step_y>
111-
</display>
28+
</display>

Diff for: ‎tests/test-bobfiles/PULSE1.bob

+10-47
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,27 @@
22
<name>Display</name>
33
<x>0</x>
44
<y>0</y>
5-
<width>426</width>
6-
<height>116</height>
5+
<width>10</width>
6+
<height>35</height>
7+
<grid_step_x>4</grid_step_x>
8+
<grid_step_y>4</grid_step_y>
79
<widget type="label" version="2.0.0">
810
<name>Title</name>
911
<class>TITLE</class>
1012
<text>PULSE1 - TEST-PREFIX:</text>
1113
<x use_class="true">0</x>
1214
<y use_class="true">0</y>
13-
<width>426</width>
15+
<width>10</width>
1416
<height>25</height>
1517
<font use_class="true">
1618
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
1719
</font>
1820
</font>
21+
<foreground_color use_class="true">
22+
<color name="Text" red="0" green="0" blue="0">
23+
</color>
24+
</foreground_color>
1925
<transparent use_class="true">true</transparent>
2026
<horizontal_alignment>1</horizontal_alignment>
2127
</widget>
22-
<widget type="group" version="2.0.0">
23-
<name>PARAMETERS</name>
24-
<x>5</x>
25-
<y>30</y>
26-
<width>416</width>
27-
<height>81</height>
28-
<transparent>true</transparent>
29-
<widget type="label" version="2.0.0">
30-
<name>Label</name>
31-
<text>PULSE1: DELAY</text>
32-
<x>0</x>
33-
<y>0</y>
34-
<width>250</width>
35-
<height>20</height>
36-
</widget>
37-
<widget type="textentry" version="3.0.0">
38-
<name>TextEntry</name>
39-
<pv_name>TEST-PREFIX:PULSE1:DELAY</pv_name>
40-
<x>255</x>
41-
<y>0</y>
42-
<width>125</width>
43-
<height>20</height>
44-
<horizontal_alignment>1</horizontal_alignment>
45-
</widget>
46-
<widget type="label" version="2.0.0">
47-
<name>Label</name>
48-
<text>PULSE1: DELAY: UNITS</text>
49-
<x>0</x>
50-
<y>25</y>
51-
<width>250</width>
52-
<height>20</height>
53-
</widget>
54-
<widget type="combo" version="2.0.0">
55-
<name>ComboBox</name>
56-
<pv_name>TEST-PREFIX:PULSE1:DELAY:UNITS</pv_name>
57-
<x>255</x>
58-
<y>25</y>
59-
<width>125</width>
60-
<height>20</height>
61-
</widget>
62-
</widget>
63-
<grid_step_x>4</grid_step_x>
64-
<grid_step_y>4</grid_step_y>
65-
</display>
28+
</display>

Diff for: ‎tests/test-bobfiles/PandA.bob

+10-14
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@
22
<name>Display</name>
33
<x>0</x>
44
<y>0</y>
5-
<width>46</width>
6-
<height>71</height>
5+
<width>10</width>
6+
<height>35</height>
7+
<grid_step_x>4</grid_step_x>
8+
<grid_step_y>4</grid_step_y>
79
<widget type="label" version="2.0.0">
810
<name>Title</name>
911
<class>TITLE</class>
1012
<text>PandA - TEST-PREFIX:</text>
1113
<x use_class="true">0</x>
1214
<y use_class="true">0</y>
13-
<width>46</width>
15+
<width>10</width>
1416
<height>25</height>
1517
<font use_class="true">
1618
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
1719
</font>
1820
</font>
21+
<foreground_color use_class="true">
22+
<color name="Text" red="0" green="0" blue="0">
23+
</color>
24+
</foreground_color>
1925
<transparent use_class="true">true</transparent>
2026
<horizontal_alignment>1</horizontal_alignment>
2127
</widget>
22-
<widget type="group" version="2.0.0">
23-
<name>POSITIONS_ TABLE</name>
24-
<x>5</x>
25-
<y>30</y>
26-
<width>36</width>
27-
<height>36</height>
28-
<transparent>true</transparent>
29-
</widget>
30-
<grid_step_x>4</grid_step_x>
31-
<grid_step_y>4</grid_step_y>
32-
</display>
28+
</display>

0 commit comments

Comments
 (0)