From 6a5a5426cd1f3fe993daa5b5522b7e5597de1e3e Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Tue, 28 May 2019 18:25:56 +0300 Subject: [PATCH] Drop support for Python 3.4 Python 3.4 was EOLed on March 18, 2019: https://devguide.python.org/devcycle/#end-of-life-branches (Some PEP-8 fixes to setup.py and a coverage report -m fix also snuck in.) --- .travis.yml | 9 ++------- CHANGES.rst | 4 ++-- setup.py | 7 +++++-- tox.ini | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80e6fd7..296faef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,12 @@ language: python -sudo: false +dist: xenial python: - 2.7 - - 3.4 - 3.5 - 3.6 + - 3.7 - pypy - pypy3 -matrix: - include: - - python: "3.7" - dist: xenial - sudo: true install: - pip install -U pip setuptools - pip install -U coverage coveralls diff --git a/CHANGES.rst b/CHANGES.rst index fbfb8af..f77cdfa 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,10 +2,10 @@ Changes ========= -4.3.1 (unreleased) +4.4.0 (unreleased) ================== -- Nothing changed yet. +- Drop support for Python 3.4. 4.3.0 (2018-10-05) diff --git a/setup.py b/setup.py index f052636..f66299e 100644 --- a/setup.py +++ b/setup.py @@ -16,12 +16,15 @@ import os from setuptools import setup, find_packages + def read(*rnames): with open(os.path.join(os.path.dirname(__file__), *rnames)) as f: return f.read() + long_description = (read('README.rst') + '\n\n' + read('CHANGES.rst')) + def alltests(): import sys import unittest @@ -36,6 +39,7 @@ def alltests(): suites = list(zope.testrunner.find.find_suites(options)) return unittest.TestSuite(suites) + TESTS_REQUIRE = [ 'zope.browsermenu', 'zope.testing', @@ -44,7 +48,7 @@ def alltests(): setup( name='zope.browserpage', - version='4.3.1.dev0', + version='4.4.0.dev0', url='https://github.com/zopefoundation/zope.browserpage', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', @@ -56,7 +60,6 @@ def alltests(): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', diff --git a/tox.ini b/tox.ini index 9c50628..75ac7e0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py27,pypy,py34,py35,py36,py37,pypy3,coverage + py27,py35,py36,py37,pypy,pypy3,coverage [testenv] commands = @@ -13,7 +13,7 @@ deps = usedevelop = true commands = coverage run -m zope.testrunner --test-path=src [] - coverage report --fail-under=100 + coverage report --fail-under=100 -m deps = {[testenv]deps} coverage