Skip to content

Commit

Permalink
FIX: test gui not stuck anymore in infinite loop; MAINT: udate workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
leloup314 committed Oct 27, 2022
1 parent 8afe1b7 commit 87c20a5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 17 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@ on:
push:
branches:
- main
- development
pull_request:
branches:
- main
- development

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
tests:
name: Testing on Python ${{matrix.python-version}} | ${{matrix.sim}}
runs-on: ubuntu-20.04

name: Testing Python ${{matrix.python-version}} on ${{matrix.os}}
runs-on: ${{matrix.os}}
env:
DISPLAY: :0

Expand All @@ -45,14 +43,14 @@ jobs:
shell: bash -l {0}
run: |
conda info -a
conda install numpy pyyaml pyzmq pytables matplotlib paramiko pytest numba tqdm
pip install uncertainties pytest pyqt5==5.12 pyqtgraph==0.11
conda install numpy pyyaml pyzmq pytables matplotlib pytest numba tqdm
pip install uncertainties pytest pyqt5==5.12 pyqtgraph==0.11 paramiko==2.11
pip install -r requirements.txt
- name: Package installation
shell: bash -l {0}
run: |
python setup.py develop
pip install -e .
- name: xvfb setup
shell: bash -l {0}
Expand All @@ -61,6 +59,6 @@ jobs:
# start xvfb in the background
sudo /usr/bin/Xvfb $DISPLAY -screen 0 1366x768x24 &
- name: Testing
- name: Testing on ref -> ${{github.head_ref || github.ref_name}}
shell: bash -l {0}
run: pytest
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
numpy # C-like arrays and vectorized functions
pyzmq # 0MQ
paramiko # SSH API in python
paramiko==2.11 # SSH API in python
pyyaml # yaml
tables # pytables HDF5 library in Python
matplotlib # Plotting colors
Expand Down
8 changes: 1 addition & 7 deletions tests/gui/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import unittest

from PyQt5 import QtWidgets, QtCore
from PyQt5 import QtWidgets

from irrad_control.processes.gui import IrradGUI

Expand All @@ -19,12 +19,6 @@ def setUpClass(cls):
cls.irrad_window = IrradGUI()
cls.irrad_window.show()

# Execute app
#cls.test_app.exec()

# Allow 5 seconds for testing
#QtCore.QTimer.singleShot(5000, cls.test_app.exit)

@classmethod
def tearDownClass(cls):
pass
Expand Down

0 comments on commit 87c20a5

Please sign in to comment.