diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0616d36..2416b44b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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} @@ -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 diff --git a/requirements.txt b/requirements.txt index 867abfa5..a97728c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/tests/gui/test_main.py b/tests/gui/test_main.py index 9deaaafb..500e777b 100644 --- a/tests/gui/test_main.py +++ b/tests/gui/test_main.py @@ -2,7 +2,7 @@ import logging import unittest -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets from irrad_control.processes.gui import IrradGUI @@ -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