From f4393d5a76520a24912764d452cfc03ddab4ce55 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <{ID}+{username}@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:27:43 +0300
Subject: [PATCH 01/17] Support github actions

---
 .github/workflows/python-package.yml | 37 ++++++++++++++++++++++++++++
 .travis.yml                          | 22 -----------------
 2 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/python-package.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
new file mode 100644
index 0000000..0c04bf0
--- /dev/null
+++ b/.github/workflows/python-package.yml
@@ -0,0 +1,37 @@
+name: Python package
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [3.4, 3.5, 3.6, 3.7, 3.8, 3.9, nightly]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        if [ "${{ matrix.python-version }}" == "3.2" ]; then
+          pip install coverage==3.7.1
+        else
+          pip install coverage
+        fi
+    - name: Run tests
+      run: |
+        make test
+        make coverage
+    - name: Upload coverage to Codecov
+      run: bash <(curl -s https://codecov.io/bash)
+      if: success()
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3c46765..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: python
-python:
-     - "3.4"
-     - "3.5"
-     - "3.6"
-     - "3.7"
-     - "3.8"
-     - "3.9"     
-     - "nightly"
-# command to install dependencies
-install:
-     # Coveralls 4.0 doesn't support Python 3.2
-     - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
-     - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi
-
-# command to run tests
-script:
-     - "make test"
-     - "make coverage"
-
-after_success:
-    - "bash <(curl -s https://codecov.io/bash)"

From c0e2aec2fae6c7cbb772cfcde7f8209d8a196bef Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:31:33 +0300
Subject: [PATCH 02/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 0c04bf0..106b7f3 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.4, 3.5, 3.6, 3.7, 3.8, 3.9, nightly]
+        python-version: [3.9, 3.12, nightly]
 
     steps:
     - uses: actions/checkout@v3

From 8784c7a8b5c71f12f068127e21aaf8295e18ec80 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:33:03 +0300
Subject: [PATCH 03/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 106b7f3..9ab0319 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9, 3.12, nightly]
+        python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v3

From 4d0d972aefa8758e7f37c735e93548cb805d7d15 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:50:40 +0300
Subject: [PATCH 04/17] Update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 59b74e6..1fec728 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 PYTHON ?= python3
 
 test:
-	$(PYTHON) -m unittest discover -v -b
+	$(PYTHON) setup.py test
 
 clean:
 	rm -rf dist/ build/ *.egg-info

From 2b42eab1931d2bb992f5910b48e11092e743166a Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:51:57 +0300
Subject: [PATCH 05/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 9ab0319..106b7f3 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.9, 3.12, nightly]
 
     steps:
     - uses: actions/checkout@v3

From 333691a1ae15ca01b08da09085c2fa068f9bfd9f Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:14:01 +0300
Subject: [PATCH 06/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 106b7f3..bacf64d 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9, 3.12, nightly]
+        python-version: [3.9, 3.12, 3.13, 3.14]
 
     steps:
     - uses: actions/checkout@v3

From 52cfed7e23b3c623544f25949d83d01bdf6148f4 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:27:31 +0300
Subject: [PATCH 07/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index bacf64d..58abfe3 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -23,6 +23,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
+        python -m pip install --upgrade pip
+        pip install setuptools      
         if [ "${{ matrix.python-version }}" == "3.2" ]; then
           pip install coverage==3.7.1
         else

From 559799f512012651f7ad144f23286e1908a9053d Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <{ID}+{username}@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:51:11 +0300
Subject: [PATCH 08/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 4 ++--
 Makefile                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 58abfe3..ad65274 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9, 3.12, 3.13, 3.14]
+        python-version: [3.9, 3.12, 3.13]
 
     steps:
     - uses: actions/checkout@v3
@@ -24,7 +24,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools      
+        pip install unittest
         if [ "${{ matrix.python-version }}" == "3.2" ]; then
           pip install coverage==3.7.1
         else
diff --git a/Makefile b/Makefile
index 1fec728..59b74e6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 PYTHON ?= python3
 
 test:
-	$(PYTHON) setup.py test
+	$(PYTHON) -m unittest discover -v -b
 
 clean:
 	rm -rf dist/ build/ *.egg-info

From 496e964b45e4c8aeff0cc59a763580212f9633e8 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:53:09 +0300
Subject: [PATCH 09/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index ad65274..3344392 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -23,8 +23,6 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install unittest
         if [ "${{ matrix.python-version }}" == "3.2" ]; then
           pip install coverage==3.7.1
         else

From dc7b1f0537f058f771a48de65e3013a1f1067bbb Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:54:53 +0300
Subject: [PATCH 10/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 3344392..504d756 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -28,6 +28,7 @@ jobs:
         else
           pip install coverage
         fi
+        pip install mock
     - name: Run tests
       run: |
         make test

From 3a3f9a9e9fecf1022fb9b14eb4190ae8aa218802 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <{ID}+{username}@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:57:10 +0300
Subject: [PATCH 11/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 504d756..95ed0b2 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -29,6 +29,7 @@ jobs:
           pip install coverage
         fi
         pip install mock
+        pip install setuptools
     - name: Run tests
       run: |
         make test

From 10d9ca68e5444c9ad81ca057635c97076ae39a55 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <{ID}+{username}@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:08:28 +0300
Subject: [PATCH 12/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 21 ++++++++-------------
 Makefile                             |  4 ++--
 setup.py                             |  2 --
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 95ed0b2..f807856 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -2,9 +2,9 @@ name: Python package
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   build:
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9, 3.12, 3.13]
+        python-version: [3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.12]
 
     steps:
     - uses: actions/checkout@v3
@@ -23,17 +23,12 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        if [ "${{ matrix.python-version }}" == "3.2" ]; then
-          pip install coverage==3.7.1
-        else
-          pip install coverage
-        fi
-        pip install mock
-        pip install setuptools
+        python -m pip install --upgrade pip
+        pip install setuptools pytest pytest-cov
+        pip install -e .
     - name: Run tests
       run: |
-        make test
-        make coverage
+        pytest --cov=zxtools --cov-report=term-missing
     - name: Upload coverage to Codecov
       run: bash <(curl -s https://codecov.io/bash)
-      if: success()
+      if: success()
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 59b74e6..ba00028 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ clean:
 distclean: clean
 
 coverage:
-	coverage run --source zxtools setup.py test
-	coverage report -m --fail-under=80
+	pytest --cov=zxtools --cov-report=term-missing
+#	coverage report -m --fail-under=80
 
 lint:
 	pylint zxtools -f parseable -r n
diff --git a/setup.py b/setup.py
index da0e04c..2140334 100755
--- a/setup.py
+++ b/setup.py
@@ -30,11 +30,9 @@
     url='http://www.codeatcpp.com/',
     license='BSD-3-Clause',
     packages=find_packages(exclude=('test', 'docs')),
-    tests_require=['mock'],
     extras_require={
         'test': dev_requires,
     },
-    test_suite='test',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Operating System :: OS Independent',

From 68e317e24f080cd4bdf55cabe4ba37fd3694aaa8 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:10:03 +0300
Subject: [PATCH 13/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index f807856..76ef797 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -2,9 +2,9 @@ name: Python package
 
 on:
   push:
-    branches: [main]
+    branches: [master]
   pull_request:
-    branches: [main]
+    branches: [master]
 
 jobs:
   build:
@@ -31,4 +31,4 @@ jobs:
         pytest --cov=zxtools --cov-report=term-missing
     - name: Upload coverage to Codecov
       run: bash <(curl -s https://codecov.io/bash)
-      if: success()
\ No newline at end of file
+      if: success()

From 685b7a559b9703551e2f4b59cd974c0e796a2bcd Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <{ID}+{username}@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:13:09 +0300
Subject: [PATCH 14/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 76ef797..c19e98a 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -12,8 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.12]
+        python-version: [3.9, 3.12, 3.13]
 
     steps:
     - uses: actions/checkout@v3

From 5db78c787545004bdc9a6d9b18d2930cf8aa1daa Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:14:09 +0300
Subject: [PATCH 15/17] Update python-package.yml

---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index c19e98a..1cb5b7d 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools pytest pytest-cov
+        pip install setuptools pytest pytest-cov mock
         pip install -e .
     - name: Run tests
       run: |

From 5763442217105c6acb6842cda678d7715a814ad0 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <{ID}+{username}@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:20:49 +0300
Subject: [PATCH 16/17] GitHub Actions badge

---
 .github/workflows/python-package.yml | 2 +-
 README.rst                           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index c19e98a..89f06ad 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -1,4 +1,4 @@
-name: Python package
+name: zxtools tests
 
 on:
   push:
diff --git a/README.rst b/README.rst
index b4b1e26..598434c 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,7 @@
 Tools to manipulate ZX Spectrum files
 =====================================
 
-.. image:: https://travis-ci.org/codeatcpp/zxtools.svg?branch=master
-    :target: https://travis-ci.org/codeatcpp/zxtools
+.. image:: https://github.com/jia3ep/zxtools/actions/workflows/python-package.yml/badge.svg
 
 .. image:: https://codecov.io/gh/codeatcpp/zxtools/branch/master/graph/badge.svg
    :target: https://codecov.io/gh/codeatcpp/zxtools

From 9e33ebf61d4e4017eb7bccbaec1d3c1cdea7d600 Mon Sep 17 00:00:00 2001
From: "Kirill V. Lyadvinsky" <jia3ep@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:23:19 +0300
Subject: [PATCH 17/17] Update README.rst

---
 README.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 598434c..084d16a 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,8 @@
 Tools to manipulate ZX Spectrum files
 =====================================
 
-.. image:: https://github.com/jia3ep/zxtools/actions/workflows/python-package.yml/badge.svg
+.. image:: https://github.com/jia3ep/zxtools/actions/workflows/python-package.yml/badge.svg
+   :target: https://github.com/jia3ep/zxtools/actions/workflows
 
 .. image:: https://codecov.io/gh/codeatcpp/zxtools/branch/master/graph/badge.svg
    :target: https://codecov.io/gh/codeatcpp/zxtools