Skip to content

Commit 91c9435

Browse files
nitzmahoneingydotnet
authored andcommitted
Squash/merge pull request #105 from nnadeau/patch-1
Removed Python 2.6 & 3.3
1 parent 507a464 commit 91c9435

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ cache: pip
66

77
matrix:
88
include:
9-
- python: 2.6
10-
env: TOXENV=py26
119
- python: 2.7
1210
env: TOXENV=py27
1311
- python: 3.4

setup.cfg

+2-8
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,10 @@
1616
#define=YAML_DECLARE_STATIC
1717

1818
# The following options are used to build PyYAML Windows installer
19-
# for Python 2.5 on my PC:
20-
#include_dirs=../../../libyaml/tags/0.1.4/include
21-
#library_dirs=../../../libyaml/tags/0.1.4/win32/vs2003/output/release/lib
22-
#define=YAML_DECLARE_STATIC
23-
24-
# The following options are used to build PyYAML Windows installer
25-
# for Python 2.6, 2.7, 3.0, 3.1 and 3.2 on my PC:
19+
# for Python 2.7 on my PC:
2620
#include_dirs=../../../libyaml/tags/0.1.4/include
2721
#library_dirs=../../../libyaml/tags/0.1.4/win32/vs2008/output/release/lib
2822
#define=YAML_DECLARE_STATIC
2923

3024
[metadata]
31-
license_file = LICENSE
25+
license_file = LICENSE

setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"Operating System :: OS Independent",
2828
"Programming Language :: Python",
2929
"Programming Language :: Python :: 2",
30-
"Programming Language :: Python :: 2.6",
3130
"Programming Language :: Python :: 2.7",
3231
"Programming Language :: Python :: 3",
3332
"Programming Language :: Python :: 3.4",
@@ -299,5 +298,5 @@ def run(self):
299298

300299
distclass=Distribution,
301300
cmdclass=cmdclass,
302-
python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
301+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
303302
)

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26,py27,pypy,py34,py35,py36,py37
2+
envlist = py27,pypy,py34,py35,py36,py37
33

44
[testenv]
55
deps =

0 commit comments

Comments
 (0)