Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed Python 2.6 & 3.3 #105

Merged
merged 11 commits into from
Feb 24, 2019
Merged

Removed Python 2.6 & 3.3 #105

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e6c100b
Removed Python 2.6
nnadeau Dec 3, 2017
ca55f88
removed python 2.6
nnadeau Dec 4, 2017
0b5c850
removed python 2.6
nnadeau Dec 4, 2017
fe47125
removed python 2.6
nnadeau Dec 4, 2017
7c56e1c
added `python_requires`
nnadeau Dec 8, 2017
27ad57c
removed python 3.3
nnadeau Dec 8, 2017
0dc2292
removed deprecated/EoL python versions
nnadeau Dec 8, 2017
4180a96
removed python 3.3
nnadeau Dec 8, 2017
f8a7833
Merge branch 'master' into patch-1
nnadeau Apr 15, 2018
a5eadd2
Merge branch 'master' into patch-1
nnadeau Jun 25, 2018
da99ea9
Merge branch 'master' into patch-1
nnadeau Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@ cache: pip

matrix:
include:
- python: 2.6
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- python: 3.3
env: TOXENV=py33
- python: 3.4
env: TOXENV=py34
- python: 3.5
Expand Down
9 changes: 1 addition & 8 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@
#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

2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
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 @@ -294,4 +293,5 @@ def run(self):

distclass=Distribution,
cmdclass=cmdclass,
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
)
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,pypy,py33,py34,py35,py36
envlist = py27,pypy,py34,py35,py36

[testenv]
deps =
Expand Down