From 7e9ae6c20b951632a51ff490a336718647139cee Mon Sep 17 00:00:00 2001 From: Diego Tavares Date: Fri, 27 Sep 2024 13:39:59 -0700 Subject: [PATCH] Delete ci/test_pyside6.sh (#1509) The pyside6 test pipeline already runs as part of the test_python pipeline as the dependency is already part of the requirements_gui.txt file for python>3.10 --- .github/workflows/testing-pipeline.yml | 9 ----- .gitignore | 4 +++ ci/run_python_tests_pyside6.sh | 48 -------------------------- ci/test_pyside6.sh | 36 ------------------- 4 files changed, 4 insertions(+), 93 deletions(-) delete mode 100755 ci/run_python_tests_pyside6.sh delete mode 100755 ci/test_pyside6.sh diff --git a/.github/workflows/testing-pipeline.yml b/.github/workflows/testing-pipeline.yml index bcbbb7706..63f09afe2 100644 --- a/.github/workflows/testing-pipeline.yml +++ b/.github/workflows/testing-pipeline.yml @@ -74,15 +74,6 @@ jobs: chown -R aswfuser:aswfgroup . su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser - test_pyside6: - name: Run CueGUI Tests using PySide6 - runs-on: ubuntu-latest - container: almalinux:9 - steps: - - uses: actions/checkout@v3 - - name: Run CueGUI Tests - run: ci/test_pyside6.sh - lint_python: name: Lint Python Code runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 370dbd6b1..ecdefd280 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ htmlcov/ .vscode .venv/ .eggs/* +.gradle/* +/cuebot/logs +/cuebot/bin +/logs \ No newline at end of file diff --git a/ci/run_python_tests_pyside6.sh b/ci/run_python_tests_pyside6.sh deleted file mode 100755 index 384841cfe..000000000 --- a/ci/run_python_tests_pyside6.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# Script for running OpenCue unit tests with PySide6. -# -# This script is written to be run within the OpenCue GitHub Actions environment. -# See `.github/workflows/testing-pipeline.yml`. - -set -e - -python_version=$(python -V 2>&1) -echo "Will run tests using ${python_version}" - -# NOTE: To run this in an almalinux environment, install these packages: -# yum -y install \ -# dbus-libs \ -# fontconfig \ -# gcc \ -# libxkbcommon-x11 \ -# mesa-libEGL-devel \ -# python-devel \ -# which \ -# xcb-util-keysyms \ -# xcb-util-image \ -# xcb-util-renderutil \ -# xcb-util-wm \ -# Xvfb - -# Install Python requirements. -python3 -m pip install --user -r requirements.txt -r requirements_gui.txt -# Replace PySide2 with PySide6. -python3 -m pip uninstall -y PySide2 -python3 -m pip install --user PySide6==6.3.2 - -# Protos need to have their Python code generated in order for tests to pass. -python -m grpc_tools.protoc -I=proto/ --python_out=pycue/opencue/compiled_proto --grpc_python_out=pycue/opencue/compiled_proto proto/*.proto -python -m grpc_tools.protoc -I=proto/ --python_out=rqd/rqd/compiled_proto --grpc_python_out=rqd/rqd/compiled_proto proto/*.proto - -# Fix compiled proto code for Python 3. -2to3 -wn -f import pycue/opencue/compiled_proto/*_pb2*.py -2to3 -wn -f import rqd/rqd/compiled_proto/*_pb2*.py - -python pycue/setup.py test -PYTHONPATH=pycue python pyoutline/setup.py test -PYTHONPATH=pycue python cueadmin/setup.py test -PYTHONPATH=pycue:pyoutline python cuesubmit/setup.py test -python rqd/setup.py test - -ci/run_gui_test.sh diff --git a/ci/test_pyside6.sh b/ci/test_pyside6.sh deleted file mode 100755 index 05bd4c173..000000000 --- a/ci/test_pyside6.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Script for testing CueGUI with PySide6. -# -# This script is written to be run within an almalinux environment in the OpenCue -# GitHub Actions environment. See .github/workflows/testing-pipeline.yml. - -set -e - -# Install needed packages. -yum -y install \ - dbus-libs \ - fontconfig \ - gcc \ - libxkbcommon-x11 \ - mesa-libEGL-devel \ - python-devel \ - which \ - xcb-util-keysyms \ - xcb-util-image \ - xcb-util-renderutil \ - xcb-util-wm \ - Xvfb - -# Install Python requirements. -python3 -m pip install --user -r requirements.txt -r requirements_gui.txt -# Replace PySide2 with PySide6. -python3 -m pip uninstall -y PySide2 -python3 -m pip install --user PySide6==6.3.2 - -# Fix compiled proto code for Python 3. -python3 -m grpc_tools.protoc -I=proto/ --python_out=pycue/opencue/compiled_proto --grpc_python_out=pycue/opencue/compiled_proto proto/*.proto -2to3 -wn -f import pycue/opencue/compiled_proto/*_pb2*.py - -# Run tests. -ci/run_gui_test.sh