From abfd47f31b03a6b43fcb111a031f21ffa66780e0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 3 Jul 2020 16:01:03 +0200
Subject: [PATCH] ci: Get rid of install.sh

---
 .github/workflows/ci.yml  | 10 ++++++++--
 .travis.yml               |  3 ++-
 scripts/dev/ci/install.sh | 35 -----------------------------------
 3 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 scripts/dev/ci/install.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 458ded78a..40293236f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,11 @@ jobs:
       - name: Set up problem matchers
         run: "python3 scripts/dev/ci/problemmatchers.py ${{ matrix.testenv }}"
       - name: Install dependencies
-        run: "bash scripts/dev/ci/install.sh ${{ matrix.testenv }}"
+        run: |
+            [[ ${{ matrix.testenv }} == eslint ]] && npm install -g eslint
+            [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get install --no-install-recommends asciidoc
+            python -m pip install -U pip
+            python -m pip install -U -r misc/requirements/requirements-tox.txt
       - name: "Run ${{ matrix.testenv }}"
         run: "tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}"
 
@@ -139,7 +143,9 @@ jobs:
         run: sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0
         if: "startsWith(matrix.os, 'ubuntu-')"
       - name: Install dependencies
-        run: "bash scripts/dev/ci/install.sh ${{ matrix.testenv }}"
+        run: |
+            python -m pip install -U pip
+            python -m pip install -U -r misc/requirements/requirements-tox.txt
       - name: "Run ${{ matrix.testenv }}"
         env:
           PYTEST_ADDOPTS: "--color=yes"
diff --git a/.travis.yml b/.travis.yml
index c7cd9c79f..9a56a756c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,8 @@ os: linux
 env: TESTENV=py35-pyqt57
 
 install:
-  - bash scripts/dev/ci/install.sh "$TESTENV"
+  - python -m pip install -U pip
+  - python -m pip install -U -r misc/requirements/requirements-tox.txt
   - ulimit -c unlimited
 
 script:
diff --git a/scripts/dev/ci/install.sh b/scripts/dev/ci/install.sh
deleted file mode 100644
index fd9eaf0d6..000000000
--- a/scripts/dev/ci/install.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# vim: ft=sh fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2016-2020 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-set -e
-
-pip_install() {
-    python -m pip install "$@"
-}
-
-testenv=$1
-
-[[ $testenv == eslint ]] && npm install -g eslint
-
-pip_install -U pip
-pip_install -U -r misc/requirements/requirements-tox.txt
-
-[[ $testenv == docs ]] && sudo apt-get install --no-install-recommends asciidoc
-exit 0