Skip to content
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.

Sign up for GitHub

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

Prep for 0.3.0 release #188

Merged
merged 8 commits into from
Apr 25, 2024
Merged

Prep for 0.3.0 release #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0fd06d
prep for 0.3.0 release
aliddell Apr 24, 2024
13a4921
Update Cargo.toml
aliddell Apr 25, 2024
c57aeea
Drop Python 3.8 and 3.9 from test matrix.
aliddell Apr 25, 2024
94da1d5
Reinstate egrabber tests.
aliddell Apr 25, 2024
1060bab
Run build job on pull_request target (temporarily)
aliddell Apr 25, 2024
10c77dd
Update build.yml
aliddell Apr 25, 2024
dc465ba
Update test_pr.yml
aliddell Apr 25, 2024
27e1907
Update Cargo.toml
aliddell Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
- ubuntu-latest
- macos-latest
python:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
Expand Down
109 changes: 49 additions & 60 deletions .github/workflows/test_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
- ubuntu-latest
- macos-latest
python:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
Expand Down Expand Up @@ -71,8 +69,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
Expand Down Expand Up @@ -111,57 +107,54 @@ jobs:
run: |
python -m pytest -k test_dcam

# TODO (aliddell): uncomment when we get an eGrabber runner up again
# egrabber:
# name: Python ${{ matrix.python }} (eGrabber)
# runs-on:
# - self-hosted
# - egrabber
# - VC-151MX-M6H00
# timeout-minutes: 20
# strategy:
# fail-fast: false
# matrix:
# python:
# - "3.8"
# - "3.9"
# - "3.10"
# - "3.11"
# - "3.12"

# permissions:
# actions: write
# env:
# GH_TOKEN: ${{ github.token }}
# steps:
# - name: Cancel Previous Runs
# uses: styfle/[email protected]
# with:
# access_token: ${{ github.token }}

# - uses: actions/checkout@v3
# with:
# submodules: true
# ref: ${{ github.event.pull_request.head.sha }}

# - name: Get CMake 3.24
# uses: lukka/get-cmake@latest
# with:
# cmakeVersion: 3.24.3

# - name: Set up Python ${{ matrix.python }}
# uses: actions/setup-python@v4
# with:
# python-version: ${{ matrix.python }}

# - name: Install
# run: |
# pip install --upgrade pip
# pip install -e .[testing]

# - name: Test
# run: |
# python -m pytest -k test_egrabber
egrabber:
name: Python ${{ matrix.python }} (eGrabber)
runs-on:
- self-hosted
- egrabber
- VC-151MX-M6H00
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
python:
- "3.10"
- "3.11"
- "3.12"

permissions:
actions: write
env:
GH_TOKEN: ${{ github.token }}
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v3
with:
submodules: true
ref: ${{ github.event.pull_request.head.sha }}

- name: Get CMake 3.24
uses: lukka/get-cmake@latest
with:
cmakeVersion: 3.24.3

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}

- name: Install
run: |
pip install --upgrade pip
pip install -e .[testing]

- name: Test
run: |
python -m pytest -k test_egrabber

spinnaker:
name: Python ${{ matrix.python }} (Spinnaker)
Expand All @@ -175,8 +168,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
Expand Down Expand Up @@ -220,14 +211,12 @@ jobs:
runs-on:
- self-hosted
- pvcam
- Prime-BSI
- BSI-Express
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "acquire-imaging"
authors = ["Nathan Clack <[email protected]>"]
version = "0.3.0-rc5"
version = "0.3.0-rc6"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion acquire-common
Open in desktop
Submodule acquire-common updated 4 files
+1 −0 acquire-driver-common/tests/integration/abort-while-waiting-for-trigger.cpp
+3 −3 acquire-video-runtime/src/acquire.c
+1 −0 acquire-video-runtime/tests/CMakeLists.txt
+115 −0 acquire-video-runtime/tests/repeat-start-no-monitor.cpp
2 changes: 1 addition & 1 deletion drivers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"acquire-driver-zarr": "0.1.10",
"acquire-driver-zarr": "0.1.11",
"acquire-driver-egrabber": "0.1.5",
"acquire-driver-hdcam": "0.1.9",
"acquire-driver-spinnaker": "0.1.1",
Expand Down
Loading