From b936f99b15bde8ba645b685e8a8e5962e3528a7a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 31 Oct 2019 10:55:50 +0000 Subject: Update Python support to 2.7 and 3.4 to 3.8 --- .travis.yml | 14 ++++---------- setup.py | 16 +++++----------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84b22df..963af9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,14 @@ -sudo: false language: python python: - - "2.6" - "2.7" - - "3.2" - - "3.3" - "3.4" - "3.5" - "3.6" + - "3.7" + - "3.8" - "pypy" -matrix: - include: - - python: 3.7 - dist: xenial - sudo: true + - "pypy3" install: - - "pip install 'virtualenv<14.0.0' 'tox<3.2'" + - "pip install tox" - "make README" script: tox -e py diff --git a/setup.py b/setup.py index fc441b0..1d90656 100644 --- a/setup.py +++ b/setup.py @@ -8,13 +8,6 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -_install_requires = [ - "cobble>=0.1.3,<0.2", -] - -if sys.version_info[:2] <= (2, 6): - _install_requires.append("argparse>=1.1,<2.0") - setup( name='mammoth', version='1.4.9', @@ -30,22 +23,23 @@ setup( ] }, keywords="docx word office clean html markdown md", - install_requires=_install_requires, + install_requires=[ + "cobble>=0.1.3,<0.2", + ], + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - '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', + 'Programming Language :: Python :: 3.8', ], ) -- cgit v1.2.3