Merge pull request #1791 from kernc/travis-trusty

[MAINT] Travis Trusty
(cherry picked from commit 4071837)

Author: astaric

.coveragerc

@@ -1,4 +1,10 @@
 [run]
+parallel = 1
+concurrency =
+    multiprocessing
+    thread
+source =
+    Orange
 omit =
     Orange/canvas/*
     Orange/widgets/*

.travis.yml

@@ -15,6 +15,10 @@ matrix:
           env: BUILD_DOCS=true
           python: '3.4'
           script: source $TRAVIS_BUILD_DIR/.travis/build_doc.sh
+        - python: '3.5'
+          env: PYQT5=true
+          dist: trusty
+          addons: { apt: { packages: [] } }
     allow_failures:
         - *pylint
     fast_finish: true
@@ -34,10 +38,8 @@ addons:
         packages:
             - libblas-dev
             - liblapack-dev
-            - postgresql-server-dev-9.1
             - libqt4-dev
             - gfortran
-            - xvfb
 
 before_install:
     - set -e  # fail on any error

.travis/install_pyqt.sh

@@ -1,3 +1,8 @@
+if [ "$PYQT5" ]; then
+    foldable pip install sip pyqt5
+    return $?;
+fi
+
 PYQT=$TRAVIS_BUILD_DIR/pyqt
 
 SIP_VERSION=4.16.9
@@ -31,5 +36,3 @@ make install
 
 cd $PYQT/PyQt
 make install
-
-pip install pyqtgraph

.travis/stage_script.sh

@@ -11,7 +11,13 @@ cd "$ORANGE_DIR"
 python -c "from Orange.tests import *"
 cp "$TRAVIS_BUILD_DIR"/.coveragerc ./  # for covereage and codecov
 export PYTHONPATH="$ORANGE_DIR" PYTHONUNBUFFERED=x
-catchsegv xvfb-run coverage run --source=Orange \
-                                -m unittest -v Orange.tests \
-                                               Orange.widgets.tests \
-                                               Orange.canvas.report.tests
+
+# Screen must be 24bpp lest pyqt5 crashes, see pytest-dev/pytest-qt/35
+XVFBARGS="-screen 0 1280x1024x24"
+
+catchsegv xvfb-run -a -s "$XVFBARGS" \
+    coverage run -m unittest -v \
+        Orange.tests \
+        Orange.widgets.tests \
+        Orange.canvas.report.tests
+coverage combine

Orange/__init__.py

@@ -25,3 +25,13 @@
 datasets = _DatasetInfo()
 
 del mod_name
+
+# If Qt is available (GUI) and Qt5, install backport for PyQt4 imports
+try:
+    import AnyQt.importhooks
+except ImportError:
+    pass
+else:
+    if AnyQt.USED_API == "pyqt5":
+        AnyQt.importhooks.install_backport_hook('pyqt4')
+    del AnyQt

Orange/canvas/__main__.py

@@ -21,12 +21,6 @@
 from AnyQt.QtWidgets import QMessageBox
 from AnyQt.QtCore import Qt, QDir, QUrl, QSettings
 
-import AnyQt.importhooks
-
-if AnyQt.USED_API == "pyqt5":
-    # Use a backport shim to fake leftover PyQt4 imports
-    AnyQt.importhooks.install_backport_hook('pyqt4')
-
 from Orange import canvas
 from Orange.canvas.application.application import CanvasApplication
 from Orange.canvas.application.canvasmain import CanvasMainWindow

Orange/canvas/report/owreport.py

@@ -248,16 +248,16 @@ def _build_html(self):
         self.report_view.setHtml(html)
 
     def _scroll_to_item(self, item):
-        self.report_view.runJavaScript(
+        self.report_view.evalJS(
             "document.getElementById('{}').scrollIntoView();".format(item.id)
         )
 
     def _change_selected_item(self, item):
-        self.report_view.runJavaScript(
+        self.report_view.evalJS(
             "var sel_el = document.getElementsByClassName('selected')[0]; "
             "if (sel_el.id != {}) "
             "   sel_el.className = 'normal';".format(item.id))
-        self.report_view.runJavaScript(
+        self.report_view.evalJS(
             "document.getElementById('{}').className = 'selected';"
             .format(item.id))
         self.report_changed = True

Orange/evaluation/testing.py

@@ -303,6 +303,8 @@ def get_augmented_data(self, model_names, include_attrs=True, include_prediction
         predictions.name = data.name
         return predictions
 
+    _MIN_NJOBS_X_SIZE = 20e3
+
     def fit(self, train_data, test_data=None):
         """Fits `self.learners` using folds sampled from the provided data.
 
@@ -343,7 +345,8 @@ def _is_picklable(obj):
         mp_ctx = mp.get_context(
             'forkserver' if sys.platform.startswith(('darwin', 'linux')) and n_jobs > 1 else None)
 
-        if n_jobs > 1 and mp_ctx.get_start_method() != 'fork' and train_data.X.size < 20e3:
+        if (n_jobs > 1 and mp_ctx.get_start_method() != 'fork' and
+                train_data.X.size < self._MIN_NJOBS_X_SIZE):
             n_jobs = 1
             warnings.warn("Working with small-enough data; single-threaded "
                           "sequential excecution will (probably) be faster. "

Orange/tests/test_evaluation_testing.py

@@ -3,6 +3,8 @@
 
 import unittest
 import multiprocessing as mp
+from unittest.mock import patch
+
 import numpy as np
 
 from Orange.classification import NaiveBayesLearner, MajorityLearner
@@ -270,6 +272,12 @@ def test_internal_cv(self):
                          CrossValidation, self.iris, [_ParameterTuningLearner()], k=2, n_jobs=3)
         proc.daemon = was_daemon
 
+    def test_njobs(self):
+        with patch('Orange.evaluation.testing.CrossValidation._MIN_NJOBS_X_SIZE', 1):
+            res = CrossValidation(self.random_table, [NaiveBayesLearner()], k=5, n_jobs=3)
+        self.check_folds(res, 5, self.nrows)
+
+
 class TestLeaveOneOut(TestSampling):
     def test_results(self):
         nrows = self.nrows

Orange/widgets/tests/base.py

@@ -19,6 +19,10 @@
 from Orange.widgets.utils.annotated_data import (ANNOTATED_DATA_FEATURE_NAME,
                                                  ANNOTATED_DATA_SIGNAL_NAME)
 
+# For tests, let memory freeing entirely to Python / OS
+import sip
+sip.setdestroyonexit(False)
+
 app = None
 
 
@@ -77,24 +81,6 @@ def setUpClass(cls):
         cls.widgets.append(report)
         OWReport.get_instance = lambda: report
 
-    @classmethod
-    def tearDownClass(cls):
-        """Cleanup after tests
-
-        Process any pending events and properly destroy created widgets by
-        calling their onDeleteWidget method which does the widget-specific
-        cleanup.
-
-        NOTE: sip.delete is mandatory. In some cases, widgets are deleted by
-        python while some references in QApplication remain
-        (QApplication::topLevelWidgets()), causing a segmentation fault when
-        QApplication is destroyed.
-        """
-        app.processEvents()
-        for w in cls.widgets:
-            w.onDeleteWidget()
-            sip.delete(w)
-
     def create_widget(self, cls, stored_settings=None, reset_default_settings=True):
         """Create a widget instance.