summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2018-05-28 21:17:21 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2018-05-28 21:17:21 +0200
commit5460db3a585b373adb47a79797f3475846bac72f (patch)
treeb1c2e053699a7b09f1e9c02704b3f73f32bcbb40
parent09d3675937e68c4d8a619c603ff10bfd9679787a (diff)
downloadpysendfile-5460db3a585b373adb47a79797f3475846bac72f.tar.gz
update travis conf
-rw-r--r--.travis.yml18
-rw-r--r--README.rst10
2 files changed, 8 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml
index 94d2d07..c352cfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,28 +3,18 @@ language: python
cache: pip
matrix:
include:
- - python: 2.6
+ # Linux
- python: 2.7
- - python: 3.3
- python: 3.4
- python: 3.5
- - python: nightly
- # - language: generic
- # os: osx
- # env: PYVER=py26
+ - python: 3.6
+ # OSX
- language: generic
os: osx
env: PYVER=py27
- # - language: generic
- # os: osx
- # env: PYVER=py33
- language: generic
os: osx
- env: PYVER=py34
- # XXX - not supported yet
- # - language: generic
- # os: osx
- # env: PYVER=py35
+ env: PYVER=py36
install:
- ./.ci/travis/install.sh
script:
diff --git a/README.rst b/README.rst
index b91a82d..13c03ff 100644
--- a/README.rst
+++ b/README.rst
@@ -185,14 +185,12 @@ Non-blocking IO
Supported platforms
===================
-This module works with Python versions from **2.5** to **3.X** and it inspired
-the integration into Python 3 stdlib
+This module works with Python versions from **2.5** to **3.X** and later on it
+was integrated into Python 3 as
+`os.sendfile() <https://docs.python.org/3/library/os.html#os.sendfile>`__
+and `socket.socket().sendfile() <https://docs.python.org/3/library/socket.html#socket.socket.sendfile>`__
(see `bpo-10882 <http://bugs.python.org/issue10882>`__ and
`bpo-17552 <https://bugs.python.org/issue17552>`__).
-Sendfile support is available in Python 3.X stdlib as
-`os.sendfile <https://docs.python.org/3/library/os.html#os.sendfile>`__ and
-`socket.sendfile <https://docs.python.org/3/library/socket.html#socket.socket.sendfile>`__
-so this package is mainly useful if you're on Python 2.
The supported platforms are:
- **Linux**