From 944bf4fc8748671300e0db9b3acd9f06c508da18 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sat, 23 Feb 2019 22:43:32 -0800 Subject: [PATCH] Squash/merge pull request #105 from nnadeau/patch-1 Removed Python 2.6 & 3.3 --- .travis.yml | 2 -- setup.cfg | 10 ++-------- setup.py | 3 +-- tox.ini | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55bb4976..c1d99a6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ cache: pip matrix: include: - - python: 2.6 - env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 - python: 3.4 diff --git a/setup.cfg b/setup.cfg index 19b1c608..b186858a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,16 +16,10 @@ #define=YAML_DECLARE_STATIC # The following options are used to build PyYAML Windows installer -# for Python 2.5 on my PC: -#include_dirs=../../../libyaml/tags/0.1.4/include -#library_dirs=../../../libyaml/tags/0.1.4/win32/vs2003/output/release/lib -#define=YAML_DECLARE_STATIC - -# The following options are used to build PyYAML Windows installer -# for Python 2.6, 2.7, 3.0, 3.1 and 3.2 on my PC: +# for Python 2.7 on my PC: #include_dirs=../../../libyaml/tags/0.1.4/include #library_dirs=../../../libyaml/tags/0.1.4/win32/vs2008/output/release/lib #define=YAML_DECLARE_STATIC [metadata] -license_file = LICENSE +license_file = LICENSE \ No newline at end of file diff --git a/setup.py b/setup.py index f4a1f564..9217435c 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,6 @@ "Operating System :: OS Independent", "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.4", @@ -299,5 +298,5 @@ def run(self): distclass=Distribution, cmdclass=cmdclass, - python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', ) diff --git a/tox.ini b/tox.ini index d673dfb7..f0df1f68 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,pypy,py34,py35,py36,py37 +envlist = py27,pypy,py34,py35,py36,py37 [testenv] deps =