Skip to content

Commit

Permalink
allow failure for python2.6 in travis and update minimum supported py…
Browse files Browse the repository at this point in the history
…thon version to 2.7, as well as adding an annoying deprecation warning
  • Loading branch information
beardypig committed Feb 6, 2017
1 parent 334f763 commit d35c808
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python

matrix:
include:
- python: '2.6'
- python: '2.7'
- python: '3.3'
- python: '3.4'
Expand All @@ -11,6 +10,7 @@ matrix:
- python: '3.6'
- python: '3.7-dev'
allow_failures:
- python: '2.6'
- python: '3.7-dev'

before_install:
Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ To install Streamlink from source you will need these dependencies.
==================================== ===========================================
Name Notes
==================================== ===========================================
`Python`_ At least version **2.6** or **3.3**.
`Python`_ At least version **2.7** or **3.3**.
`python-setuptools`_

**Automatically installed by the setup script**
--------------------------------------------------------------------------------
`python-argparse`_ Only needed on Python **2.6**.
`python-argparse`_ Only needed on Python versions older than **2.7**.
`python-futures`_ Only needed on Python **2.x**.
`python-requests`_ At least version **1.0**.
`python-singledispatch`_ Only needed on Python versions older than **3.4**.
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"Environment :: Console",
"Operating System :: POSIX",
"Operating System :: Microsoft :: Windows",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
Expand Down
10 changes: 10 additions & 0 deletions src/streamlink/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,18 @@
Full documentation is available at https://streamlink.github.io.
"""
import warnings
from sys import version_info


if version_info[:2] == (2, 6):
warnings.warn(
"Python 2.6 is no longer supported by the Python core team, please "
"upgrade your Python. A future version of streamlink will drop "
"support for Python 2.6",
DeprecationWarning
)

__title__ = "streamlink"
__version__ = "0.3.1"
__license__ = "Simplified BSD"
Expand Down

0 comments on commit d35c808

Please sign in to comment.