From 53f1cf9cb2f829a410989e82184feb7f0991adb5 Mon Sep 17 00:00:00 2001
From: Peter Brittain <peter.brittain.os@gmail.com>
Date: Sat, 16 Sep 2023 20:49:05 +0100
Subject: [PATCH] Add windows, remove travis

---
 .github/workflows/test.yml | 26 +++++++++++++++--
 .travis.yml                | 57 --------------------------------------
 noserun.bat                |  2 --
 noserun.sh                 |  2 --
 4 files changed, 24 insertions(+), 63 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100755 noserun.bat
 delete mode 100755 noserun.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e8d38c5..3587da9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,12 +6,34 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.10.11, 3.11.3, pypy3.9]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements/dev.txt
+    - name: Test
+      run: |
+        coverage run --source=asciimatics -m unittest
+    - name: Upload to coveralls
+      uses: AndreMiras/coveralls-python-action@develop
+      with:
+        parallel: true
+        flag-name: Unit Test
 
+  testwindows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -32,7 +54,7 @@ jobs:
         flag-name: Unit Test
 
   coveralls_finish:
-    needs: test
+    needs: [ test, testwindows ]
     runs-on: ubuntu-latest
     steps:
     - name: Coveralls finished
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4825479..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-
-sudo: false
-
-language: python
-dist: jammy
-
-env:
-  global:
-    COVERALLS_PARALLEL=true
-
-matrix:
-  fast_finish: true
-  include:
-    - name: "3.9 Linux"
-      env: BUILD=test FORCE_TTY=Y
-      python: '3.9'
-      script: ./noserun.sh
-    - name: "3.10 Linux"
-      env: BUILD=test FORCE_TTY=Y
-      python: '3.10'
-      script: ./noserun.sh
-    - name: "3.11 Linux"
-      env: BUILD=test FORCE_TTY=Y
-      python: '3.11'
-      script: ./noserun.sh
-    - name: "pypy3 Linux"
-      env: BUILD=test FORCE_TTY=Y
-      python: 'pypy3'
-      script: ./noserun.sh
-    - name: "3.8 Windows"
-      os: windows
-      language: shell       # 'language: python' is an error on Travis CI Windows
-      before_install:
-         - choco install python --version 3.8.9
-         - python -m pip install --upgrade pip
-         - python -m pip install pywin32
-      env: PATH=/c/Python38:/c/Python38/Scripts:$PATH BUILD=test FORCE_TTY=Y
-      script: ./noserun.bat
-
-install:
-  - pip list
-  - pip install -U setuptools
-  - pip install -r requirements/dev.txt
-
-after_success:
-  - |
-    set -ex
-    case "$BUILD" in
-      testxxxx)
-        coveralls -v
-        ;;
-    esac
-    set +ex
-
-notifications:
-  webhooks: https://coveralls.io/webhook
diff --git a/noserun.bat b/noserun.bat
deleted file mode 100755
index a60df0f..0000000
--- a/noserun.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-coverage run --source=asciimatics -m unittest
-
diff --git a/noserun.sh b/noserun.sh
deleted file mode 100755
index a60df0f..0000000
--- a/noserun.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-coverage run --source=asciimatics -m unittest
-