From a16d8b8c625bc08abc2d8a9283b47c552f157a43 Mon Sep 17 00:00:00 2001 From: jbellister-slac Date: Thu, 1 May 2025 11:40:04 -0700 Subject: [PATCH 1/5] BLD: Add pyca back into the dev-requirements.txt file as pyca-epics and install it from PyPI during our testing workflows --- .github/workflows/run-tests.yml | 4 ++-- dev-requirements.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9dc647914..9876ae235 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -44,9 +44,9 @@ jobs: if [ "$RUNNER_OS" == "Windows" ]; then conda install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} elif [ "$RUNNER_OS" == "macOS" ]; then - mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} git p4p pyca + mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} p4p else - mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} pyca + mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} fi - name: Install additional Python dependencies with pip diff --git a/dev-requirements.txt b/dev-requirements.txt index a31c6bd65..bcf8935aa 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,3 +5,4 @@ pytest-cov pytest-timeout p4p pre-commit +pyca-epics From 2ce9bd3e64ca700f029497b0f7105b365d5ac87c Mon Sep 17 00:00:00 2001 From: jbellister-slac Date: Thu, 1 May 2025 11:51:31 -0700 Subject: [PATCH 2/5] BLD: Restore git for macOS workflow --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9876ae235..a87ef5706 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -44,7 +44,7 @@ jobs: if [ "$RUNNER_OS" == "Windows" ]; then conda install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} elif [ "$RUNNER_OS" == "macOS" ]; then - mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} p4p + mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} git p4p else mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} fi From 83edf8e824b4a730070078935cf1e22c5e1662f5 Mon Sep 17 00:00:00 2001 From: jbellister-slac Date: Thu, 1 May 2025 11:56:19 -0700 Subject: [PATCH 3/5] BLD: Install optional dependencies during macOS test workflow again. Only Windows doesn't have support for the other optional EPICS client packages now. --- .github/workflows/run-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a87ef5706..1d2a59ce4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -52,10 +52,10 @@ jobs: - name: Install additional Python dependencies with pip shell: bash -el {0} run: | - if [ "$RUNNER_OS" == "Linux" ]; then - pip install .[test] - else + if [ "$RUNNER_OS" == "Windows" ]; then pip install .[test-no-optional] + else + pip install .[test] fi - name: Install packages for testing a PyQt app on Linux From e0cfb9925600fd21d6045bb396e09558afd30c48 Mon Sep 17 00:00:00 2001 From: jbellister-slac Date: Fri, 16 May 2025 10:20:28 -0700 Subject: [PATCH 4/5] BLD: Install p4p from PyPI during the macOS test run workflow --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 1d2a59ce4..3bcea487a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -44,7 +44,7 @@ jobs: if [ "$RUNNER_OS" == "Windows" ]; then conda install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} elif [ "$RUNNER_OS" == "macOS" ]; then - mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} git p4p + mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} git else mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }} fi From 7815c17aeefc2374f01cee416deb43700e58646a Mon Sep 17 00:00:00 2001 From: jbellister-slac Date: Fri, 16 May 2025 11:40:18 -0700 Subject: [PATCH 5/5] BLD: Exclude PyQt 5.12.3 in macOS arm64 tests since that version isn't available for arm64 --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3bcea487a..03f96b44a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,6 +22,9 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] python-version: ['3.9', '3.10'] pyqt-version: [5.12.3, 5.15.9] + exclude: + - os: macos-latest + pyqt-version: 5.12.3 # Version 5.12.3 of PyQT is not available for osx-arm64 env: DISPLAY: ':99.0' QT_MAC_WANTS_LAYER: 1 # PyQT gui tests involving qtbot interaction on macOS will fail without this @@ -36,7 +39,6 @@ jobs: miniforge-version: latest activate-environment: pydm-env conda-remove-defaults: true - architecture: x64 # Ensure macOS finds PyQt 5.12.3 which isn't available with osx-arm64 - name: Install PyDM with Mamba shell: bash -el {0}