Prepare for Pylint transition from versions <2

5 files changed, 17 insertions, 40 deletions

diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index f12cb926..904ed376 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -1,4 +1,4 @@
-name: Python doctest and pytest
+name: Python doctest and manpage-completion
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [2.7, 3.5, 3.6]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/py37.yml b/.github/workflows/py37.yml
deleted file mode 100644
index ca8210a2..00000000
--- a/.github/workflows/py37.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Python 3.7 lints and tests
-
-on:
-  push:
-    paths:
-      - '.github/workflows/py37.yml'
-      - '*.py'
-
-jobs:
-  test_py:
-    runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [3.7]
-    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: |
-        python -m pip install --upgrade pip
-        pip install -r <(sed 's/<2//' requirements.txt)
-    - name: Lint and test with pylint, flake8, doctest, pytest
-      run: |
-        make test_py
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 1daba84c..073b78a6 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [2.7, 3.5, 3.6]
+        python-version: [3.5, 3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v1
       with:
@@ -25,6 +25,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-    - name: Lint and test with pylint, flake8, -d-o-c-t-e-s-t-, -p-y-t-e-s-t-
+    - name: Lint and test with pylint, flake8, -d-o-c-t-e-s-t-, -m-a-n-c-o-m-p-l-e-t-e-
       run: |
         make test_pylint test_flake8 test_pytest
diff --git a/.travis.yml b/.travis.yml
index 7a156b2b..ce55f33e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,20 @@
 dist: 'xenial'
 
 language: 'python'
-python:
-  - '2.7'
-  - '3.5'
-  - '3.6'
+jobs:
+  include:
+    - name: "Python 2.7 no linting"
+      python: '2.7'
+      env: PY2='TRUE'
+    - name: "Python 3"
+      python:
+        - '3.5'
+        - '3.6'
+        - '3.7'
+        - '3.8'
 
 install:
   - 'pip install -r requirements.txt'
 
 script:
-  - 'make test'
+  - 'if [ -z "${PY2}" ]; then make test; else make test_doctest test_pytest test_other; fi'
diff --git a/requirements.txt b/requirements.txt
index 411a2a97..fc51e82a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 flake8
-pylint<2
+pylint
 pytest