Skip to content

Commit c1ce2a0

Browse files
aliddellnclack
andauthored
Prep for 0.3.0 release (#188)
This uses a branch of acquire-common other than main which incorporates the fix in acquire-project/acquire-common#44, but doesn't have to dance around S3-related changes to the storage API. --------- Co-authored-by: Nathan Clack <[email protected]>
1 parent 7f93a2f commit c1ce2a0

File tree

5 files changed

+52
-65
lines changed

5 files changed

+52
-65
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616
- ubuntu-latest
1717
- macos-latest
1818
python:
19-
- "3.8"
20-
- "3.9"
2119
- "3.10"
2220
- "3.11"
2321
- "3.12"

.github/workflows/test_pr.yml

Lines changed: 49 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
- ubuntu-latest
2222
- macos-latest
2323
python:
24-
- "3.8"
25-
- "3.9"
2624
- "3.10"
2725
- "3.11"
2826
- "3.12"
@@ -71,8 +69,6 @@ jobs:
7169
fail-fast: false
7270
matrix:
7371
python:
74-
- "3.8"
75-
- "3.9"
7672
- "3.10"
7773
- "3.11"
7874
- "3.12"
@@ -111,57 +107,54 @@ jobs:
111107
run: |
112108
python -m pytest -k test_dcam
113109
114-
# TODO (aliddell): uncomment when we get an eGrabber runner up again
115-
# egrabber:
116-
# name: Python ${{ matrix.python }} (eGrabber)
117-
# runs-on:
118-
# - self-hosted
119-
# - egrabber
120-
# - VC-151MX-M6H00
121-
# timeout-minutes: 20
122-
# strategy:
123-
# fail-fast: false
124-
# matrix:
125-
# python:
126-
# - "3.8"
127-
# - "3.9"
128-
# - "3.10"
129-
# - "3.11"
130-
# - "3.12"
131-
132-
# permissions:
133-
# actions: write
134-
# env:
135-
# GH_TOKEN: ${{ github.token }}
136-
# steps:
137-
# - name: Cancel Previous Runs
138-
# uses: styfle/[email protected]
139-
# with:
140-
# access_token: ${{ github.token }}
141-
142-
# - uses: actions/checkout@v3
143-
# with:
144-
# submodules: true
145-
# ref: ${{ github.event.pull_request.head.sha }}
146-
147-
# - name: Get CMake 3.24
148-
# uses: lukka/get-cmake@latest
149-
# with:
150-
# cmakeVersion: 3.24.3
151-
152-
# - name: Set up Python ${{ matrix.python }}
153-
# uses: actions/setup-python@v4
154-
# with:
155-
# python-version: ${{ matrix.python }}
156-
157-
# - name: Install
158-
# run: |
159-
# pip install --upgrade pip
160-
# pip install -e .[testing]
161-
162-
# - name: Test
163-
# run: |
164-
# python -m pytest -k test_egrabber
110+
egrabber:
111+
name: Python ${{ matrix.python }} (eGrabber)
112+
runs-on:
113+
- self-hosted
114+
- egrabber
115+
- VC-151MX-M6H00
116+
timeout-minutes: 20
117+
strategy:
118+
fail-fast: false
119+
matrix:
120+
python:
121+
- "3.10"
122+
- "3.11"
123+
- "3.12"
124+
125+
permissions:
126+
actions: write
127+
env:
128+
GH_TOKEN: ${{ github.token }}
129+
steps:
130+
- name: Cancel Previous Runs
131+
uses: styfle/[email protected]
132+
with:
133+
access_token: ${{ github.token }}
134+
135+
- uses: actions/checkout@v3
136+
with:
137+
submodules: true
138+
ref: ${{ github.event.pull_request.head.sha }}
139+
140+
- name: Get CMake 3.24
141+
uses: lukka/get-cmake@latest
142+
with:
143+
cmakeVersion: 3.24.3
144+
145+
- name: Set up Python ${{ matrix.python }}
146+
uses: actions/setup-python@v4
147+
with:
148+
python-version: ${{ matrix.python }}
149+
150+
- name: Install
151+
run: |
152+
pip install --upgrade pip
153+
pip install -e .[testing]
154+
155+
- name: Test
156+
run: |
157+
python -m pytest -k test_egrabber
165158
166159
spinnaker:
167160
name: Python ${{ matrix.python }} (Spinnaker)
@@ -175,8 +168,6 @@ jobs:
175168
fail-fast: false
176169
matrix:
177170
python:
178-
- "3.8"
179-
- "3.9"
180171
- "3.10"
181172
- "3.11"
182173
- "3.12"
@@ -220,14 +211,12 @@ jobs:
220211
runs-on:
221212
- self-hosted
222213
- pvcam
223-
- Prime-BSI
214+
- BSI-Express
224215
timeout-minutes: 20
225216
strategy:
226217
fail-fast: false
227218
matrix:
228219
python:
229-
- "3.8"
230-
- "3.9"
231220
- "3.10"
232221
- "3.11"
233222
- "3.12"

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "acquire-imaging"
33
authors = ["Nathan Clack <[email protected]>"]
4-
version = "0.3.0-rc5"
4+
version = "0.3.0-rc6"
55
edition = "2021"
66

77
[lib]

drivers.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"acquire-driver-zarr": "0.1.10",
2+
"acquire-driver-zarr": "0.1.11",
33
"acquire-driver-egrabber": "0.1.5",
44
"acquire-driver-hdcam": "0.1.9",
55
"acquire-driver-spinnaker": "0.1.1",

0 commit comments

Comments
 (0)