3 files changed, 38 insertions, 41 deletions
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
deleted file mode 100644
index 596cf4b1..00000000
--- a/.github/workflows/doctest.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Python pytest, doctest and manpage-completion EXPECTED FAILURE
-
-on:
-  push:
-    paths:
-      - '.github/workflows/doctest.yml'
-      - '*.py'
-
-jobs:
-  test_py:
-    runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
-    env:
-      TERM: dumb
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        sudo apt-get install ncurses-bin
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: doctest
-      run: |
-        make test_pytest test_doctest test_other
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
new file mode 100644
index 00000000..eb44669f
--- /dev/null
+++ b/.github/workflows/pylint.yml
@@ -0,0 +1,32 @@
+name: Pylint
+
+on:
+  push:
+    paths:
+      - '.github/workflows/python.yml'
+      - '**.py'
+  pull_request:
+    paths:
+      - '.github/workflows/python.yml'
+      - '**.py'
+
+jobs:
+  test_py:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [pypy3, 3.5, 3.6, 3.7, 3.8, 3.9]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Lint with pylint
+      run: |
+        make test_pylint
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 1964a005..3d56e06c 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -1,4 +1,4 @@
-name: Python lints and tests
+name: PEP8 and tests
 
 on:
   push:
@@ -16,21 +16,19 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [pypy2, 2.7, pypy3, 3.5, 3.6, 3.7, 3.8, 3.9]
     env:
       TERM: dumb
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-    - name: Lint and test with pylint, flake8, but not -d-o-c-t-e-s-t-, -m-a-n-c-o-m-p-l-e-t-e-
+    - name: Flake8 and test
       run: |
-        make test_pylint test_flake8 test_pytest
+        make test_flake8 test_pytest test_doctest test_other