diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d7af89..c27a53a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,6 @@ jobs: - ubuntu-latest - macos-latest python: - - "3.8" - - "3.9" - "3.10" - "3.11" - "3.12" diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml index b13d348..013799d 100644 --- a/.github/workflows/test_pr.yml +++ b/.github/workflows/test_pr.yml @@ -21,8 +21,6 @@ jobs: - ubuntu-latest - macos-latest python: - - "3.8" - - "3.9" - "3.10" - "3.11" - "3.12" @@ -71,8 +69,6 @@ jobs: fail-fast: false matrix: python: - - "3.8" - - "3.9" - "3.10" - "3.11" - "3.12" @@ -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/cancel-workflow-action@0.11.0 - # 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/cancel-workflow-action@0.11.0 + 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) @@ -175,8 +168,6 @@ jobs: fail-fast: false matrix: python: - - "3.8" - - "3.9" - "3.10" - "3.11" - "3.12" @@ -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" diff --git a/Cargo.toml b/Cargo.toml index c73f7a8..e2202a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "acquire-imaging" authors = ["Nathan Clack "] -version = "0.3.0-rc5" +version = "0.3.0-rc6" edition = "2021" [lib] diff --git a/acquire-common b/acquire-common index 4444f5c..deec93e 160000 --- a/acquire-common +++ b/acquire-common @@ -1 +1 @@ -Subproject commit 4444f5c95f699e22b47e9a6e321359016faa03e6 +Subproject commit deec93eff3362ee00a29377aed70b9fe67976341 diff --git a/drivers.json b/drivers.json index 713cc83..ca069fd 100644 --- a/drivers.json +++ b/drivers.json @@ -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",