From 1c8ed169d86d2cd78d416c5bf6184f314d726c1e Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 5 Jan 2021 22:19:18 +0100
Subject: [PATCH 1/2] CI workflow: misc. fixes

---
 .github/workflows/ci.yml | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3354e282..f852a9a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,17 +37,35 @@ jobs:
     - name: Lint with flake8
       run: |
         pip install flake8
-        flake8 src scripts conftest.py
+        flake8 src scripts setup.py
 
   pytest:
 
     needs: lint
+
+    strategy:
+      matrix:
+        include:
+            - os: ubuntu-18.04
+              python-version: 3.5
+              toxenv: py35
+            - os: ubuntu-18.04
+              python-version: 3.6
+              toxenv: py36
+            - os: ubuntu-20.04
+              python-version: 3.7
+              toxenv: py37
+            - os: ubuntu-20.04
+              python-version: 3.8
+              toxenv: py38
+            - os: ubuntu-20.04
+              python-version: 3.9
+              toxenv: py39
+
     env:
-      # Configure pkg-config to use OpenSSL from Homebrew
-      PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig
       TOXENV: ${{ matrix.toxenv }}
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 10
 
     steps:
@@ -55,14 +73,14 @@ jobs:
       with:
         # just fetching 1 commit is not enough for setuptools-scm, so we fetch all
         fetch-depth: 0
-    - name: Set up Python
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.5
+        python-version: ${{ matrix.python-version }}
     - name: Install Python requirements
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        pip install -r requirements.d/development.txt
+        pip install -r requirements.d/dev.txt
     - name: run pytest via tox
       run: |
         tox --skip-missing-interpreters
@@ -72,5 +90,4 @@ jobs:
         OS: ${{ runner.os }}
         python: ${{ matrix.python-version }}
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
         env_vars: OS, python

From 50df6273f0ab58e369768407b4bb90177b604e31 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 5 Jan 2021 23:07:07 +0100
Subject: [PATCH 2/2] remove .travis.yml, fix MANIFEST.in

---
 .travis.yml | 37 -------------------------------------
 MANIFEST.in |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index de2a27b0..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-language: python
-
-cache:
-    directories:
-        - $HOME/.cache/pip
-
-os: linux
-
-matrix:
-    include:
-        - python: 3.5
-          dist: xenial
-          env: TOXENV=py35
-        - python: 3.6
-          dist: bionic
-          env: TOXENV=py36
-        - python: 3.7
-          dist: bionic
-          env: TOXENV=py37
-        - python: 3.8
-          dist: focal
-          env: TOXENV=py38
-        - python: 3.9
-          dist: focal
-          env: TOXENV=py39
-        - python: 3.8
-          dist: focal
-          env: TOXENV=flake8
-
-install:
-  - "pip install -r requirements.d/dev.txt"
-
-script:
-  - "tox"
-
-after_success:
-  - codecov -e TRAVIS_OS_NAME TOXENV
diff --git a/MANIFEST.in b/MANIFEST.in
index 5a3556ae..e7cfa835 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 # stuff we need to include into the sdist is handled automatically by
 # setuptools_scm - it includes all git-committed files.
 # but we want to exclude some committed files/dirs not needed in the sdist:
-exclude .gitattributes .gitignore .travis.yml
+exclude .gitattributes .gitignore .github