From 2e6b3d5f230386f8a3089bd51c1fd2b027bc4b49 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 10 Oct 2021 18:56:11 +0200 Subject: [PATCH] Test with Python 3.10 --- .github/workflows/test.yml | 6 +++--- Jenkinsfile | 9 +++++---- setup.cfg | 1 + tox.ini | 8 ++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index acc2238ea..981b29bee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 @@ -25,11 +25,11 @@ jobs: - name: Test with tox run: tox - if: ${{ matrix.python-version != '3.9' }} + if: ${{ matrix.python-version != '3.10' }} - name: Test with tox (and upload coverage) uses: paambaati/codeclimate-action@v3.0.0 - if: ${{ matrix.python-version == '3.9' }} + if: ${{ matrix.python-version == '3.10' }} env: CC_TEST_REPORTER_ID: 2a411f596959fc32f5d73f3ba7cef8cc4d5733299d742dbfc97fd6c190b9010c with: diff --git a/Jenkinsfile b/Jenkinsfile index f2e0af46a..c01a1625a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,9 @@ def pys = [ - [name: 'Python 3.9', docker:'python:3.9-buster', tox:'py39,flake8', main: true], - [name: 'Python 3.8', docker:'python:3.8-buster', tox:'py38', main: false], - [name: 'Python 3.7', docker:'python:3.7-buster', tox:'py37', main: false], - [name: 'Python 3.6', docker:'python:3.6-buster', tox:'py36', main: false], + [name: 'Python 3.10', docker: 'python:3.10-buster', tox:'py310,flake8', main: true], + [name: 'Python 3.9', docker: 'python:3.9-buster', tox:'py39', main: false], + [name: 'Python 3.8', docker: 'python:3.8-buster', tox:'py38', main: false], + [name: 'Python 3.7', docker: 'python:3.7-buster', tox:'py37', main: false], + [name: 'Python 3.6', docker: 'python:3.6-buster', tox:'py36', main: false], ] properties([ diff --git a/setup.cfg b/setup.cfg index 2721a7bf9..c2e9313bb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,7 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Topic :: Internet :: WWW/HTTP Topic :: Multimedia :: Graphics keywords = comic,webcomic,downloader,archiver,crawler diff --git a/tox.ini b/tox.ini index 2c33c5f11..c0b17467c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,13 @@ [tox] -envlist = py36, py37, py38, py39, flake8 +envlist = py36, py37, py38, py39, py310, flake8 [gh-actions] python = - 3.5: py35 3.6: py36 3.7: py37 3.8: py38 - 3.9: py39, flak8 + 3.9: py39 + 3.10: py310, flake8 [testenv] commands = @@ -38,7 +38,7 @@ max-line-length = 100 ignore = E127,E128,E241,FI12,FI14,FI15,FI50,FI51,FI53,FI54,FI55,W504 require-code = True no-accept-encodings = True -min-version = 3.5 +min-version = 3.6 # Duplicated for CodeClimate... [pep8]