From 864b1759e3a5b368045cb9ea016a5db6e64475b5 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 1 Jan 2020 12:02:19 +0100 Subject: [PATCH] Drop support for Python versions before 3.4. --- .travis.yml | 25 ++----------------------- README.md | 5 ++--- setup.py | 9 +++------ 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index f447026ea..b4694d63f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python sudo: true install: - if [ "$WITH_OPT_DEPS" = "true" ] ; then pip install -vr requirements.txt; fi - - if [[ "$TRAVIS_PYTHON_VERSION" =~ ^3\.[4-9] ]] ; then pip install -v git+https://github.com/ProgVal/irctest.git; fi + - pip install -v git+https://github.com/ProgVal/irctest.git - echo "y" | pip uninstall limnoria || true # command to run tests, e.g. python setup.py test script: @@ -14,24 +14,6 @@ notifications: email: false matrix: include: - - python: "2.6" - env: WITH_OPT_DEPS=false - dist: trusty - - python: "2.7" - env: WITH_OPT_DEPS=false - dist: trusty - - python: "2.7" - env: WITH_OPT_DEPS=true - dist: trusty - - python: "3.2" - env: WITH_OPT_DEPS=false - dist: trusty - - python: "3.2" - env: WITH_OPT_DEPS=true - dist: trusty - - python: "3.3" - env: WITH_OPT_DEPS=true - dist: trusty - python: "3.4" env: WITH_OPT_DEPS=true dist: trusty @@ -55,10 +37,7 @@ matrix: env: WITH_OPT_DEPS=true dist: xenial - - python: "pypy" - env: WITH_OPT_DEPS=true - dist: trusty - - python: "pypy3.3-5.2-alpha1" + - python: "pypy3" env: WITH_OPT_DEPS=true dist: trusty - python: "pypy3" diff --git a/README.md b/README.md index 75751d7e5..068615b32 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,8 @@ Master branch: [![Build Status (master branch)](https://travis-ci.org/ProgVal/Li Testing branch: [![Build Status (testing branch)](https://travis-ci.org/ProgVal/Limnoria.png?branch=testing)](https://travis-ci.org/ProgVal/Limnoria) -Limnoria supports CPython 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, nightly; -and Pypy 2 and 3. It works best with CPython 3.4 and higher. -Python 2.5 and older versions are not supported. +Limnoria supports CPython 3.4, 3.5, 3.6, 3.7, nightly; +and Pypy 3. # Support diff --git a/setup.py b/setup.py index b4ff8ebc3..035b1b36b 100644 --- a/setup.py +++ b/setup.py @@ -81,8 +81,8 @@ if version: fd.write(' pass\n') fd.close() -if sys.version_info < (2, 6, 0): - sys.stderr.write("Supybot requires Python 2.6 or newer.") +if sys.version_info < (3, 4, 0): + sys.stderr.write("Limnoria requires Python 3.4 or newer.") sys.stderr.write(os.linesep) sys.exit(-1) @@ -206,13 +206,10 @@ setup( 'Operating System :: OS Independent', 'Operating System :: POSIX', 'Operating System :: Microsoft :: Windows', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Communications :: Chat :: Internet Relay Chat', 'Topic :: Software Development :: Libraries :: Python Modules', ],