Skip to content

Commit

Permalink
Squash/merge pull request #105 from nnadeau/patch-1
Browse files Browse the repository at this point in the history
Removed Python 2.6 & 3.3
  • Loading branch information
nitzmahone authored and ingydotnet committed Mar 7, 2019
1 parent e387291 commit 944bf4f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ cache: pip

matrix:
include:
- python: 2.6
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- python: 3.4
Expand Down
10 changes: 2 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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.*',
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,pypy,py34,py35,py36,py37
envlist = py27,pypy,py34,py35,py36,py37

[testenv]
deps =
Expand Down

0 comments on commit 944bf4f

Please sign in to comment.