From a11baeb84d1cf39e8d92fd60e78b9be960c63e11 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 10 Sep 2017 01:44:53 +0200
Subject: [PATCH] travis: Fix some more issues

---
 .travis.yml                      | 7 +++++++
 scripts/dev/ci/travis_install.sh | 7 +++----
 tox.ini                          | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd2e8d172..f9de7fd9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,10 @@ matrix:
       env: TESTENV=flake8
     - os: linux
       env: TESTENV=docs
+      addons:
+         apt:
+           packages:
+           - asciidoc
     - os: linux
       env: TESTENV=vulture
     - os: linux
@@ -53,6 +57,9 @@ matrix:
       env: TESTENV=check-manifest
     - os: linux
       env: TESTENV=eslint
+      language: node_js
+      python: null
+      node_js: node
   allow_failures:
     - os: osx
       env: TESTENV=py36 OSX=elcapitan
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index 62314b2b1..eeb2ffec2 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -65,8 +65,8 @@ pip_install() {
 
 npm_install() {
     # Make sure npm is up-to-date first
-    travis_retry sudo npm install -g npm
-    travis_retry sudo npm install -g "$@"
+    travis_retry npm install -g npm
+    travis_retry npm install -g "$@"
 }
 
 install_node() {
@@ -123,7 +123,7 @@ case $TESTENV in
         ;;
     pylint|vulture)
         #apt_install $pyqt_pkgs libpython3.4-dev
-        check_pyqt
+        #check_pyqt
         ;;
     flake8)
         #apt_install libpython3.4-dev
@@ -139,7 +139,6 @@ case $TESTENV in
     pyroma|check-manifest)
         ;;
     eslint)
-        install_node
         echo "node: $(node --version)"
         echo "npm: $(npm --version)"
         npm_install eslint
diff --git a/tox.ini b/tox.ini
index e916f4a83..5ec438f8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -191,9 +191,9 @@ basepython = python3
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-vulture.txt
+    -r{toxinidir}/misc/requirements/requirements-pyqt.txt
 setenv = PYTHONPATH={toxinidir}
 commands =
-    {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} scripts/dev/run_vulture.py
 
 [testenv:pylint]
@@ -250,8 +250,8 @@ whitelist_externals = git
 passenv = TRAVIS_PULL_REQUEST
 deps =
     -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-pyqt.txt
 commands =
-    {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} scripts/dev/src2asciidoc.py {posargs}
     {envpython} scripts/dev/check_doc_changes.py {posargs}
     {envpython} scripts/asciidoc2html.py {posargs}