Squash/merge pull request #105 from nnadeau/patch-1
Removed Python 2.6 & 3.3
diff --git a/.travis.yml b/.travis.yml
index 55bb497..c1d99a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@
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 19b1c60..b186858 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 f4a1f56..9217435 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 @@
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 d673dfb..f0df1f6 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 =
