From 15756c51e40525afb51185e26a2580e8ae7233b3 Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Wed, 11 Mar 2020 15:31:37 +0100
Subject: [PATCH 1/2] Add github actions CI

---
 .github/workflows/test.yml | 30 ++++++++++++++++++++++++++++++
 tox.ini                    |  6 ++++++
 2 files changed, 36 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..46103f0
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,30 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Test application
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master, develop]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - 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 tox tox-gh-actions
+      - name: Test with tox
+        run: tox
diff --git a/tox.ini b/tox.ini
index d97d1d9..104aee9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,12 @@
 envlist = py36, py37, py38, lint
 skip_missing_interpreters = True
 
+[gh-actions]
+python =
+    3.6: py36, lint
+    3.7: py37
+    3.8: py38
+
 [travis]
 python =
   3.6: py36, lint

From 6b50c5de021cb37eab2e948d5fb1ea3c55a70d89 Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Wed, 11 Mar 2020 15:35:55 +0100
Subject: [PATCH 2/2] Remove Travis CI

---
 .travis.yml | 10 ----------
 tox.ini     |  4 ----
 2 files changed, 14 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ff970b4..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-dist: xenial
-language: python
-cache: pip
-python:
-  - "3.6"
-  - "3.7"
-  - "3.8"
-install:
-  - pip install -U tox-travis
-script: tox
diff --git a/tox.ini b/tox.ini
index 104aee9..c022ad8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,10 +8,6 @@ python =
     3.7: py37
     3.8: py38
 
-[travis]
-python =
-  3.6: py36, lint
-
 [testenv]
 commands =
   pytest --timeout=30 --cov=camacqplugins --cov-report= {posargs}