From fb72880a0a190fd5f2c080c21ecde101157b0725 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Tue, 15 Dec 2020 23:44:55 +0100 Subject: [PATCH 1/4] Create a python-app.yml Github action --- .github/workflows/python-app.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/python-app.yml diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml new file mode 100644 index 000000000..856da7eb2 --- /dev/null +++ b/.github/workflows/python-app.yml @@ -0,0 +1,29 @@ +# 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: Python application + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install poetry tox + poetry install + - name: Run Tox + run: tox From ee5e75d1aa28f9b4808826a6d1d1de5e4f2ade23 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Sun, 27 Dec 2020 11:39:21 +0100 Subject: [PATCH 2/4] Fix test Expected should come first --- tests/arch/zx48k/optimizer/test_optimizer_asm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/arch/zx48k/optimizer/test_optimizer_asm.py b/tests/arch/zx48k/optimizer/test_optimizer_asm.py index b9a3918ad..3bb63de84 100644 --- a/tests/arch/zx48k/optimizer/test_optimizer_asm.py +++ b/tests/arch/zx48k/optimizer/test_optimizer_asm.py @@ -16,7 +16,7 @@ def test_raises_error_on_empty_instruction(self): def test_unknown_instruction(self): a = asm.Asm(' unknown instr ') - self.assertEqual(a.bytes, ()) + self.assertEqual((), a.bytes) def test_simplify_arg(self): a = helpers.simplify_asm_args('ld a, (126 - 1)') From 80f168d67c7bbe3579a2596de177cf541c687f48 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Sun, 27 Dec 2020 11:43:57 +0100 Subject: [PATCH 3/4] Drop six dependency --- tests/api/test_symbolTable.py | 2 +- tests/symbols/test_symbolARRAYACCESS.py | 2 +- tests/symbols/test_symbolBINARY.py | 2 +- tests/symbols/test_symbolBOUND.py | 2 +- tests/symbols/test_symbolTYPECAST.py | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/api/test_symbolTable.py b/tests/api/test_symbolTable.py index c17990db3..947e5eb77 100644 --- a/tests/api/test_symbolTable.py +++ b/tests/api/test_symbolTable.py @@ -3,7 +3,7 @@ import unittest from unittest import TestCase -from six import StringIO +from io import StringIO from src.api.symboltable import SymbolTable from src.api.constants import TYPE diff --git a/tests/symbols/test_symbolARRAYACCESS.py b/tests/symbols/test_symbolARRAYACCESS.py index 089a3d2fc..213c7dca2 100644 --- a/tests/symbols/test_symbolARRAYACCESS.py +++ b/tests/symbols/test_symbolARRAYACCESS.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- from unittest import TestCase -from six import StringIO +from io import StringIO from src import symbols import src.api.global_ as gl diff --git a/tests/symbols/test_symbolBINARY.py b/tests/symbols/test_symbolBINARY.py index e98c45b3a..4073e2a7f 100644 --- a/tests/symbols/test_symbolBINARY.py +++ b/tests/symbols/test_symbolBINARY.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- from unittest import TestCase -from six import StringIO +from io import StringIO from src.api.config import OPTIONS from src import symbols diff --git a/tests/symbols/test_symbolBOUND.py b/tests/symbols/test_symbolBOUND.py index 4f02f7e84..53a3c1769 100644 --- a/tests/symbols/test_symbolBOUND.py +++ b/tests/symbols/test_symbolBOUND.py @@ -3,7 +3,7 @@ import unittest from unittest import TestCase -from six import StringIO +from io import StringIO from src.api.config import OPTIONS from src import symbols diff --git a/tests/symbols/test_symbolTYPECAST.py b/tests/symbols/test_symbolTYPECAST.py index 655dbb01f..bc212e484 100644 --- a/tests/symbols/test_symbolTYPECAST.py +++ b/tests/symbols/test_symbolTYPECAST.py @@ -1,13 +1,14 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- + from unittest import TestCase +from io import StringIO from src.symbols import TYPECAST from src.symbols import NUMBER from src.symbols import VAR from src.symbols.type_ import Type from src.api.config import OPTIONS -from six import StringIO from src.api.constants import CLASS from src.libzxbpp import zxbpp From 39efc372d43581a35223e266aa4a9e9dcf014834 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Sun, 27 Dec 2020 11:44:11 +0100 Subject: [PATCH 4/4] Update travis python to 3.8 --- .travis.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e324d728d..77a012f04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python python: # - "2.7" <- Unsupported, uses 2.7.9 ? - - "3.6" + - "3.8" # PyPy versions # - "pypy" # PyPy2 2.5.0 # - "pypy3" # Pypy3 2.4.0 diff --git a/tox.ini b/tox.ini index 9433d41aa..481ee7810 100644 --- a/tox.ini +++ b/tox.ini @@ -38,7 +38,7 @@ commands = flake8 [travis] python = - 3.6: py36, flake8 + 3.8: py38, flake8 [pytest] norecursedirs = test_*tmp runtime