Merge branch 'develop' into feature/v7

This commit is contained in:
Ivan Kravets
2023-07-28 18:40:46 +03:00
3 changed files with 9 additions and 2 deletions

View File

@ -8,7 +8,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-20.04, windows-latest, macos-latest] 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 }} runs-on: ${{ matrix.os }}
@ -27,12 +27,17 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install tox pip install tox
- name: Core System Info
run: |
tox -e py
- name: Python Lint - name: Python Lint
if: ${{ matrix.python-version != '3.6' }} if: ${{ matrix.python-version != '3.6' }}
run: | run: |
tox -e lint tox -e lint
- name: Integration Tests - name: Integration Tests
if: ${{ matrix.python-version == '3.9' }}
run: | run: |
tox -e testcore tox -e testcore

View File

@ -35,7 +35,8 @@ minimal_requirements = [
"click==8.1.*; " + py_gte_37, "click==8.1.*; " + py_gte_37,
"colorama", "colorama",
"marshmallow==3.14.1; " + py_below_37, "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", "pyelftools==0.29",
"pyserial==3.5.*", # keep in sync "device/monitor/terminal.py" "pyserial==3.5.*", # keep in sync "device/monitor/terminal.py"
"requests==2.*", "requests==2.*",

View File

@ -34,6 +34,7 @@ deps =
jsondiff jsondiff
commands = commands =
{envpython} --version {envpython} --version
pio system info
[testenv:lint] [testenv:lint]
commands = commands =