From 54ff3a8d4ebbf63c67bb2f741b014b69e99c820f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 28 Jul 2023 18:24:47 +0300 Subject: [PATCH 1/3] Test all compatible Pythons --- .github/workflows/core.yml | 3 ++- tox.ini | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 445e6e0e..10fcf101 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -8,7 +8,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, windows-latest, macos-latest] - python-version: ["3.6", "3.9", "3.11"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] runs-on: ${{ matrix.os }} @@ -33,6 +33,7 @@ jobs: tox -e lint - name: Integration Tests + if: ${{ matrix.python-version == '3.9' }} run: | tox -e testcore diff --git a/tox.ini b/tox.ini index f8a15f3b..2eda9b90 100644 --- a/tox.ini +++ b/tox.ini @@ -34,6 +34,7 @@ deps = jsondiff commands = {envpython} --version + pio system info [testenv:lint] commands = From 3a21f48c9ca3dd082c27189fdb0cba4556468290 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 28 Jul 2023 18:37:30 +0300 Subject: [PATCH 2/3] Lock "marshmallow" dependency to the 3.19.0 for Python 3.7 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6d450519..ef9543e3 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,8 @@ minimal_requirements = [ "click==8.1.*; " + py_gte_37, "colorama", "marshmallow==3.14.1; " + py_below_37, - "marshmallow==3.20.*; " + py_gte_37, + "marshmallow==3.19.0; " + py_37, + "marshmallow==3.20.*; " + py_gte_38, "pyelftools==0.29", "pyserial==3.5.*", # keep in sync "device/monitor/terminal.py" "requests==2.*", From dccc14b50772fdacd2b9392ab07498000f4b6b30 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 28 Jul 2023 18:40:14 +0300 Subject: [PATCH 3/3] Ensure that PIO Core System Info works on all supported Pythons --- .github/workflows/core.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 10fcf101..c7c020a3 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -27,6 +27,10 @@ jobs: python -m pip install --upgrade pip pip install tox + - name: Core System Info + run: | + tox -e py + - name: Python Lint if: ${{ matrix.python-version != '3.6' }} run: |