From fd08437e850018a706b49e334af233f229b049a1 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 29 Apr 2025 10:48:09 +0100 Subject: [PATCH 1/2] try linux build --- .github/workflows/Lint-and-test.yml | 5 +++-- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Lint-and-test.yml b/.github/workflows/Lint-and-test.yml index 2a4920c..e96610e 100644 --- a/.github/workflows/Lint-and-test.yml +++ b/.github/workflows/Lint-and-test.yml @@ -6,12 +6,13 @@ jobs: with: compare-branch: origin/main python-ver: '3.11' - runs-on: windows-latest tests: - runs-on: windows-latest + runs-on: ${{ matrix.os }} strategy: matrix: version: ['3.11'] + os: ["ubuntu-latest", "windows-latest"] + fail-fast: false steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/pyproject.toml b/pyproject.toml index 6c3ff25..b1a4208 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ classifiers = [ dependencies = [ "pcaspy@git+https://github.com/ISISComputingGroup/pcaspy", - "genie-python[plot]==15.1.0", + "genie-python[plot]", "CaChannel", "mock", "parameterized", From 4ad6ad7b41fa0cedd9b21e19298a660c328aea0a Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 29 Apr 2025 11:01:12 +0100 Subject: [PATCH 2/2] try using normal pcaspy? --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b1a4208..6e9c50b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ ] dependencies = [ - "pcaspy@git+https://github.com/ISISComputingGroup/pcaspy", + "pcaspy", "genie-python[plot]", "CaChannel", "mock",