From a85b8051922e7a48a4e7654d87e3c20252e71b3b Mon Sep 17 00:00:00 2001
From: Mike Naberezny <mike@naberezny.com>
Date: Sat, 18 Nov 2023 12:23:33 -0800
Subject: [PATCH] Fix CI tests for 3.4 and 3.5

---
 .github/workflows/main.yml | 80 ++++++++++++++++++++++++++++++++++++++
 CHANGES.rst                |  6 +--
 setup.py                   |  6 ++-
 3 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d1c5d07..95af8ba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,6 +6,85 @@ env:
   PIP_DISABLE_PIP_VERSION_CHECK: 1
 
 jobs:
+  build_py34:
+    runs-on: ubuntu-20.04
+    container: python:3.4
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Show Python version
+      run: python -V
+
+    - name: Install dependencies
+      run: pip install setuptools
+
+    - name: Run the tests
+      run: python setup.py test -q
+
+    - name: Install it
+      run: python setup.py install
+
+    - name: Install asxxxx
+      run: |
+        wget --no-verbose --content-disposition https://github.com/6502org/6502.org/raw/74f5d0c0f9b73d5e353bde7b3b25ea7f43b527a1/public/tools/asm/asxs5p50.zip
+        unzip -q asxs5p50.zip
+        make -C asxv5pxx/asxmak/linux/build all
+        echo "$PWD/asxv5pxx/asxmak/linux/build" >> $GITHUB_PATH
+
+    - name: Install srecord
+      run: |
+        wget http://ftp.us.debian.org/debian/pool/main/s/srecord/libsrecord0_1.64-1_amd64.deb
+        dpkg -i libsrecord0_1.64-1_amd64.deb
+        wget http://ftp.us.debian.org/debian/pool/main/s/srecord/srecord_1.64-1_amd64.deb
+        dpkg -i srecord_1.64-1_amd64.deb
+
+    - name: Disassemble and reassemble the test program
+      run: |
+        make -C k0dasm/tests/end_to_end all
+
+  build_py35:
+    runs-on: ubuntu-20.04
+    container: python:3.5
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Show Python version
+      run: python -V
+
+    - name: Install dependencies
+      run: pip install setuptools
+
+    - name: Run the tests
+      run: python setup.py test -q
+
+    - name: Install it
+      run: python setup.py install
+
+    - name: Install asxxxx
+      run: |
+        cat /etc/issue
+        wget --no-verbose --content-disposition https://github.com/6502org/6502.org/raw/74f5d0c0f9b73d5e353bde7b3b25ea7f43b527a1/public/tools/asm/asxs5p50.zip
+        unzip -q asxs5p50.zip
+        make -C asxv5pxx/asxmak/linux/build all
+        echo "$PWD/asxv5pxx/asxmak/linux/build" >> $GITHUB_PATH
+
+    - name: Install srecord
+      run: |
+        wget http://ftp.us.debian.org/debian/pool/main/s/srecord/libsrecord0_1.64-1_amd64.deb
+        dpkg -i libsrecord0_1.64-1_amd64.deb
+        wget http://ftp.us.debian.org/debian/pool/main/s/srecord/srecord_1.64-1_amd64.deb
+        dpkg -i srecord_1.64-1_amd64.deb
+
+    - name: Disassemble and reassemble the test program
+      run: |
+        make -C k0dasm/tests/end_to_end all
+
   build:
     runs-on: ubuntu-20.04
     strategy:
@@ -35,6 +114,7 @@ jobs:
 
     - name: Install asxxxx
       run: |
+        cat /etc/issue
         wget --no-verbose --content-disposition https://github.com/6502org/6502.org/raw/74f5d0c0f9b73d5e353bde7b3b25ea7f43b527a1/public/tools/asm/asxs5p50.zip
         unzip -q asxs5p50.zip
         make -C asxv5pxx/asxmak/linux/build all
diff --git a/CHANGES.rst b/CHANGES.rst
index 46d7fea..624f894 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,6 @@
-2.0.0.dev0 (Next Release)
--------------------------
+1.0.2 (Next Release)
+--------------------
 
-Support for Python 3.4 and 3.5 has been dropped.
-k0dasm now requires Python 3.6 or later.
 
 1.0.1 (2021-01-29)
 ------------------
diff --git a/setup.py b/setup.py
index d0da029..2574e78 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,8 @@
 import sys
 from setuptools import setup, find_packages
 
-if sys.version_info[:2] < (3, 6):
-    raise RuntimeError('k0dasm requires Python 3.6 or later')
+if sys.version_info[:2] < (3, 4):
+    raise RuntimeError('k0dasm requires Python 3.4 or later')
 
 DESC = "Renesas (NEC) 78K0 disassembler"
 here = os.path.abspath(os.path.dirname(__file__))
@@ -22,6 +22,8 @@
     'Operating System :: POSIX',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',