From 2002a5f61a0671df7ca56f2fc8ce4a250125cb5b Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Fri, 30 Apr 2021 21:24:25 +0200 Subject: [PATCH] Drop Python 3.5 support --- .travis.yml | 5 ++--- Jenkinsfile | 5 ++--- README.md | 2 +- setup.cfg | 14 ++++++-------- tox.ini | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 608e48720..e67dea891 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,11 @@ os: linux language: python jobs: include: - - python: "3.5" - python: "3.6" - python: "3.7" - python: "3.8" - env: "CC_TEST_REPORTER_ID=2a411f596959fc32f5d73f3ba7cef8cc4d5733299d742dbfc97fd6c190b9010c" - python: "3.9" + env: "CC_TEST_REPORTER_ID=2a411f596959fc32f5d73f3ba7cef8cc4d5733299d742dbfc97fd6c190b9010c" cache: pip git: depth: false @@ -38,4 +37,4 @@ deploy: script: .github/deploy.sh on: branch: master - python: 3.8 + python: 3.9 diff --git a/Jenkinsfile b/Jenkinsfile index 572bc807f..6a3ea8ed7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,8 @@ def pys = [ - [name: 'Python 3.9', docker:'python:3.9-buster', tox:'py39', main: false], - [name: 'Python 3.8', docker:'python:3.8-buster', tox:'py38,flake8', main: true], + [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.5', docker:'python:3.5-buster', tox:'py35', main: false], ] properties([ diff --git a/README.md b/README.md index 0854dc2be..a1c2d1eb2 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ are old enough to view them. ### Dependencies Since dosage is written in [Python](http://www.python.org/), a Python -installation is required: Dosage needs at least Python 3.5. Dosage requires +installation is required: Dosage needs at least Python 3.6. Dosage requires some Python modules from PyPI, so installation with `pip` is recommended. ### Using the Windows binary diff --git a/setup.cfg b/setup.cfg index 82e0ff9bd..3e90f5ee9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ -[metadata]'), +[metadata] name = dosage description = a comic strip downloader and archiver long_description = file: README.md @@ -18,7 +18,6 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 @@ -40,7 +39,7 @@ install_requires = requests>=2.0 cached_property;python_version<'3.8' importlib_metadata;python_version<'3.8' -python_requires = >=3.5 +python_requires = >=3.6 setup_requires = setuptools>=38.3.0 setuptools_scm @@ -59,8 +58,8 @@ css = dev = allure-pytest flake8 - flake8-2020;python_version>'3.5' - flake8-breakpoint;python_version>'3.5' + flake8-2020 + flake8-breakpoint flake8-bugbear flake8-coding flake8-commas @@ -70,10 +69,9 @@ dev = flake8-functions==0.0.4 flake8-future-import flake8-logging-format - flake8-no-fstring;python_version>'3.5' flake8-pytest - flake8-pytest-style;python_version>'3.5' - flake8-strings;python_version>'3.5' + flake8-pytest-style + flake8-strings pytest-cov pytest-xdist responses diff --git a/tox.ini b/tox.ini index c3f80b239..4af86b4bc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py35, py36, py37, py38, py39, flake8 +envlist = py36, py37, py38, py39, flake8 [testenv] commands =