Merge remote-tracking branch 'origin/pr/240'

* origin/pr/240:
  travis: use included configs, drop R4.0 dom0 test
  Replace quamash with qasync

.travis.yml

@@ -1,23 +1,4 @@
-sudo: required
-dist: bionic
-language: python
-python:
-  - '3.5'
-install:
- - pip install --quiet -r ci/requirements.txt
- - git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
-script:
- - PYTHONPATH=test-packages pylint --rcfile=ci/pylintrc qubesmanager
- - ~/qubes-builder/scripts/travis-build
-env:
- - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- - DIST_DOM0=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=centos7 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
-
-# don't build tags which are meant for code signing only
-branches:
-  except:
-    - /.*_.*/
-    - build
+import:
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-base-r4.1.yml
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-dom0-r4.1.yml
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-vms-rpm-r4.1.yml

ci/requirements.txt

@@ -8,4 +8,4 @@ lxml
 pylint
 sphinx
 PyYAML
-Quamash
+qasync

debian/control

@@ -22,7 +22,7 @@ Depends:
   python3-qubesadmin,
   python3-pyqt5,
   python3-pyinotify,
-  python3-quamash,
+  python3-qasync,
   qubes-desktop-linux-common,
   qubes-artwork,
   pmount,
@@ -32,4 +32,4 @@ Depends:
   ${misc:Depends}
 Conflicts: qubes-core-agent (<< 4.1.9)
 Description: Qubes administrative tools
-  Tools to manage Qubes system using Admin API
+  Tools to manage Qubes system using Admin API

qubesmanager/tests/__init__.py

@@ -1,7 +1,7 @@
 import asyncio
 import sys
 
-import quamash
+import qasync
 from PyQt5 import QtWidgets
 
 qtapp = None
@@ -11,7 +11,7 @@ def init_qtapp():
     global qtapp, loop
     if qtapp is None:
         qtapp = QtWidgets.QApplication(sys.argv)
-        loop = quamash.QEventLoop(qtapp)
+        loop = qasync.QEventLoop(qtapp)
         asyncio.set_event_loop(loop)
     qtapp.processEvents()
     return qtapp, loop

qubesmanager/utils.py

@@ -29,7 +29,7 @@ import traceback
 import asyncio
 from contextlib import suppress
 import sys
-import quamash
+import qasync
 from qubesadmin import events
 
 from PyQt5 import QtWidgets, QtCore, QtGui  # pylint: disable=import-error
@@ -484,7 +484,7 @@ def run_asynchronous(window_class):
 
     qubes_app = qubesadmin.Qubes()
 
-    loop = quamash.QEventLoop(qt_app)
+    loop = qasync.QEventLoop(qt_app)
     asyncio.set_event_loop(loop)
     dispatcher = events.EventsDispatcher(qubes_app)
 

rpm_spec/qmgr.spec.in

@@ -11,7 +11,7 @@ Requires:	python%{python3_pkgversion}
 Requires:	python%{python3_pkgversion}-PyQt5
 Requires:	python%{python3_pkgversion}-inotify
 Requires:	python%{python3_pkgversion}-qubesadmin >= 4.1.1
-Requires:	python%{python3_pkgversion}-Quamash
+Requires:	python%{python3_pkgversion}-qasync
 Requires:	qubes-desktop-linux-common >= 4.1.2
 Requires:	qubes-artwork
 Requires:	pmount