From dda0d310081b084e14338fb05c40d0191e2c0a7e Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Wed, 26 Jun 2024 11:06:11 +0200 Subject: [PATCH 1/3] update github runner actions use newer node version in runners --- .github/workflows/lint.yml | 6 +++--- .github/workflows/packaging.yml | 6 +++--- .github/workflows/tox_checks.yml | 4 ++-- .github/workflows/tox_pytests.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 406e040..69d316e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,10 +15,10 @@ jobs: steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -26,7 +26,7 @@ jobs: run: pip install black flake8 - name: Run linters - uses: samuelmeuli/lint-action@v1 + uses: wearerequired/lint-action@v2 with: github_token: ${{ secrets.github_token }} # Enable linters diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 68e876b..548f9ef 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -19,9 +19,9 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -31,7 +31,7 @@ jobs: run: python setup.py sdist bdist_wheel - name: Run twine check run: twine check dist/* - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: tox-gh-actions-dist path: dist diff --git a/.github/workflows/tox_checks.yml b/.github/workflows/tox_checks.yml index 2055d82..f7cac49 100644 --- a/.github/workflows/tox_checks.yml +++ b/.github/workflows/tox_checks.yml @@ -29,12 +29,12 @@ jobs: uses: actions/checkout@v2 - name: Set up Python ${{ env.default_python || '3.9' }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "${{ env.default_python || '3.9' }}" - name: Pip cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'setup.py') }} diff --git a/.github/workflows/tox_pytests.yml b/.github/workflows/tox_pytests.yml index 802e002..54b822a 100644 --- a/.github/workflows/tox_pytests.yml +++ b/.github/workflows/tox_pytests.yml @@ -19,11 +19,11 @@ jobs: python-version: [3.7, 3.8, 3.9] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install xmllint run: sudo apt install coinor-cbc - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From 42170dec4496a5cec46423b4fddf4aa34079f4e0 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Wed, 26 Jun 2024 11:06:22 +0200 Subject: [PATCH 2/3] add maurerle to authors --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index df06047..6accd7d 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -7,6 +7,7 @@ Authors * Amedeo Ceruti * Birgit Schachler * Caroline Möller + * Florian Maurer * Guido Plessmann * Hendrik Huyskens * Jann Launer From 2c72ea7ec7a176c4e71870f513e4dd0d5b2b7665 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Wed, 26 Jun 2024 11:12:00 +0200 Subject: [PATCH 3/3] update python envs to supported versions --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/packaging.yml | 2 +- .github/workflows/tox_checks.yml | 4 ++-- .github/workflows/tox_pytests.yml | 2 +- tox.ini | 32 +++++++++------------------- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5b4064e..fdb49b5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -25,7 +25,7 @@ If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - OS: [e.g. iOS, Debian, Ubuntu, Windows10] - - Python version [e.g. 3.8] + - Python version [e.g. 3.11] **Additional context** Add any other context about the problem here. diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 69d316e..3845f00 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: Install Python dependencies run: pip install black flake8 diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 548f9ef..efef29c 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -16,7 +16,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.9] + python-version: [3.11] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tox_checks.yml b/.github/workflows/tox_checks.yml index f7cac49..8c5ba3e 100644 --- a/.github/workflows/tox_checks.yml +++ b/.github/workflows/tox_checks.yml @@ -28,10 +28,10 @@ jobs: - name: Git clone uses: actions/checkout@v2 - - name: Set up Python ${{ env.default_python || '3.9' }} + - name: Set up Python ${{ env.default_python || '3.11' }} uses: actions/setup-python@v5 with: - python-version: "${{ env.default_python || '3.9' }}" + python-version: "${{ env.default_python || '3.11' }}" - name: Pip cache uses: actions/cache@v4 diff --git a/.github/workflows/tox_pytests.yml b/.github/workflows/tox_pytests.yml index 54b822a..cbf67fa 100644 --- a/.github/workflows/tox_pytests.yml +++ b/.github/workflows/tox_pytests.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v4 diff --git a/tox.ini b/tox.ini index cf359c8..c3a1335 100644 --- a/tox.ini +++ b/tox.ini @@ -3,19 +3,18 @@ envlist = clean, check, docs, - py36 - py37 - py38 py39 + py310 + py311 py3-cover, pypy3, report [gh-actions] python = - 3.7: py37 - 3.8: py38 3.9: py39 + 3.10: py310 + 3.11: py311 [testenv] basepython = @@ -83,19 +82,8 @@ commands = coverage erase skip_install = true deps = coverage -[testenv:py36] -basepython = {env:TOXPYTHON:python3.6} -setenv = - {[testenv]setenv} -usedevelop = true -commands = - {posargs:pytest --cov --cov-report=term-missing -vv} -deps = - {[testenv]deps} - pytest-cov - -[testenv:py37] -basepython = {env:TOXPYTHON:python3.7} +[testenv:py39] +basepython = {env:TOXPYTHON:python3.9} setenv = {[testenv]setenv} usedevelop = true @@ -105,8 +93,8 @@ deps = {[testenv]deps} pytest-cov -[testenv:py38] -basepython = {env:TOXPYTHON:python3.8} +[testenv:py310] +basepython = {env:TOXPYTHON:python3.10} setenv = {[testenv]setenv} usedevelop = true @@ -116,8 +104,8 @@ deps = {[testenv]deps} pytest-cov -[testenv:py39] -basepython = {env:TOXPYTHON:python3.9} +[testenv:py311] +basepython = {env:TOXPYTHON:python3.11} setenv = {[testenv]setenv} usedevelop = true