From 6e43d0dc1418f0fd8c998e44cca8b846df1a00a6 Mon Sep 17 00:00:00 2001
From: "Daniel G. Krakowczyk" <daniel.krakowczyk@uni-potsdam.de>
Date: Tue, 10 Oct 2023 09:09:31 +0200
Subject: [PATCH] ci: revert refactor GitHub workflows (#596)

This reverts commit 43c75cac077f44b982a205cbdfefc29184fad07b.
---
 .github/workflows/docs.yml   | 41 ---------------------------
 .github/workflows/pylint.yml | 25 ----------------
 .github/workflows/tests.yml  | 55 +++++++++++++++++++++++++++++++++++-
 3 files changed, 54 insertions(+), 67 deletions(-)
 delete mode 100644 .github/workflows/docs.yml
 delete mode 100644 .github/workflows/pylint.yml

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 86cdbdd4f..000000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: docs
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  docs:
-    name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install pandoc
-        uses: r-lib/actions/setup-pandoc@v2
-        with:
-          pandoc-version: '2.19.2'
-      - name: Install base python for tox
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
-      - name: Install tox
-        run: python -m pip install tox
-      - name: Setup test environment
-        run: tox -vv --notest -e docs
-      - name: Run test
-        run: tox --skip-pkg-install -e docs
-      - name: Upload documentation
-        uses: actions/upload-artifact@v3
-        with:
-          name: html-docs-${{ matrix.os }}
-          path: docs/build/
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
deleted file mode 100644
index ee3d97c2c..000000000
--- a/.github/workflows/pylint.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: pylint
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  pylint:
-    name: pylint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install base python for tox
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.9"
-      - name: Install tox
-        run: python -m pip install tox
-      - name: Setup test environment
-        run: tox -vv --notest -e pylint
-      - name: Run test
-        run: tox --skip-pkg-install -e pylint
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 357001799..be8fe2285 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.tox_env }} / ${{ matrix.os }}
+    name: test ${{ matrix.tox_env }} (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     env:
       MPLBACKEND: Agg
@@ -52,3 +52,56 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+
+  pylint:
+    name: pylint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install base python for tox
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Setup test environment
+        run: tox -vv --notest -e pylint
+      - name: Run test
+        run: tox --skip-pkg-install -e pylint
+
+
+  docs:
+    name: docs (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install pandoc
+        uses: r-lib/actions/setup-pandoc@v2
+        with:
+          pandoc-version: '2.19.2'
+      - name: Install base python for tox
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Setup test environment
+        run: tox -vv --notest -e docs
+      - name: Run test
+        run: tox --skip-pkg-install -e docs
+      - name: Upload documentation
+        uses: actions/upload-artifact@v3
+        with:
+          name: html-docs-${{ matrix.os }}
+          path: docs/build/