Skip to content

Commit 8f8de02

Browse files
committed
Ditch Python 2.6, bump up requirements
1 parent 879645a commit 8f8de02

File tree

7 files changed

+14
-27
lines changed

7 files changed

+14
-27
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ env:
55
- REQUIREMENTS=requirements.txt
66
- TEST_REQUIREMENTS=social/tests/requirements.txt
77
python:
8-
- "2.6"
98
- "2.7"
109
matrix:
1110
include:

requirements-python3.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
python3-openid>=3.0.1
2-
requests>=1.1.0
3-
oauthlib>=0.3.8
4-
requests-oauthlib>0.3.2
5-
six>=1.2.0
6-
PyJWT>=1.0.0
1+
python3-openid>=3.0.9
2+
requests>=2.9.1
3+
oauthlib>=1.0.3
4+
requests-oauthlib>=0.6.1
5+
six>=1.10.0
6+
PyJWT>=1.4.0

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
python-openid>=2.2
2-
requests>=2.5.1
3-
oauthlib>=0.3.8
4-
requests-oauthlib>=0.3.1
5-
six>=1.2.0
6-
PyJWT>=1.0.0
1+
python-openid>=2.2.5
2+
requests>=2.9.1
3+
oauthlib>=1.0.3
4+
requests-oauthlib>=0.6.1
5+
six>=1.10.0
6+
PyJWT>=1.4.0

run_tox.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
# 1. Install pyenv
44
# 2. Install python versions
5-
# pyenv install 2.6.9
65
# pyenv install 2.7.11
76
# pyenv install 3.3.6
87
# pyenv install 3.4.4
98
# pyenv install pypy-4.0.1
109
# 3. Switch to each version and install / update setuptools, pip, tox
11-
# pyenv local 2.6.9
1210
# pip install -U setuptools pip tox
1311
# 4. Enable versions
14-
# pyenv local 2.6.9 2.7.11 3.3.6 3.4.4 pypy-4.0.1
12+
# pyenv local 2.7.11 3.3.6 3.4.4 pypy-4.0.1
1513
# 5. Run tox
1614

1715
which pyenv && eval "$(pyenv init -)"

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def get_packages():
7676
'Intended Audience :: Developers',
7777
'Environment :: Web Environment',
7878
'Programming Language :: Python',
79-
'Programming Language :: Python :: 2.6',
8079
'Programming Language :: Python :: 2.7',
8180
'Programming Language :: Python :: 3'
8281
],

social/tests/__init__.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +0,0 @@
1-
import sys
2-
import warnings
3-
4-
5-
# Ignore deprecation warnings on Python2.6. Maybe it's time to ditch this
6-
# oldie?
7-
if sys.version_info[0] == 2 and sys.version_info[1] == 6 or \
8-
hasattr(sys, 'pypy_version_info'):
9-
warnings.filterwarnings('ignore', category=Warning)

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py26, py27, py33, py34, pypy, doc
7+
envlist = py27, py33, py34, pypy, doc
88

99
[testenv]
1010
commands = nosetests --where=social/tests --stop

0 commit comments

Comments
 (0)