Merge pull request #79 from buhman/master

docs/api: add missing word

Author: njsmith

.travis.yml

@@ -1,24 +1,25 @@
 language: python
+dist: xenial
 python:
   # To see supported options, run:
   #   s3cmd ls s3://travis-python-archives/binaries/ubuntu/16.04/x86_64/
   # We put pypy first, b/c for tests they're the slowest
-  - pypy2.7-5.10.0
-  - pypy3.5-5.10.1
+  - pypy2.7-6.0
+  - pypy3.5-6.0
   - 2.7
-  - 3.3  # probably irrelevant but so far supporting it has been free
   - 3.4
   - 3.5
   - 3.6
-  - 3.7-dev
-sudo: false
+  - 3.7
+  - 3.8-dev
 
 before_install:
-  - pip install -r test-requirements.txt
+  - pip install -U pip setuptools wheel
+  - pip install -Ur test-requirements.txt
   - pip install codecov
 
 script:
-  - py.test --cov=h11 --cov-config=.coveragerc h11
+  - pytest --cov=h11 --cov-config=.coveragerc h11
 
 after_success:
   - codecov

README.rst

@@ -112,7 +112,7 @@ library.
 It has a test suite with 100.0% coverage for both statements and
 branches.
 
-Currently it supports Python 3 (testing on 3.3-3.6), Python 2.7, and PyPy.
+Currently it supports Python 3 (testing on 3.4-3.7), Python 2.7, and PyPy.
 (Originally it had a Cython wrapper for `http-parser
 <https://github.com/nodejs/http-parser>`_ and a beautiful nested state
 machine implemented with ``yield from`` to postprocess the output. But

bench/benchmarks/benchmarks.py

@@ -45,7 +45,8 @@ def time_server_basic_get_with_realistic_headers():
 def _run_basic_get_repeatedly():
     from timeit import default_timer
     REPEAT = 10000
-    while True:
+    #while True:
+    for _ in range(7):
         start = default_timer()
         for _ in range(REPEAT):
             time_server_basic_get_with_realistic_headers()

docs/source/api.rst

@@ -652,7 +652,7 @@ response.
 
 As a server, h11 provides the minimal support for pipelining required
 to comply with the HTTP/1.1 standard: if the client sends multiple
-pipelined requests, then we the first request until we reach the
+pipelined requests, then we handle the first request until we reach the
 :data:`DONE` state, and then :meth:`~Connection.next_event` will
 pause and refuse to parse any more events until the response is
 completed and :meth:`~Connection.start_next_cycle` is called. See the

docs/source/index.rst

@@ -44,7 +44,7 @@ whatever. But h11 makes it much easier to implement something like
 Vital statistics
 ----------------
 
-* Requirements: Python 2.7 or Python 3.3+ (PyPy works great)
+* Requirements: Python 2.7 or Python 3.4+ (PyPy works great)
 
 * Install: ``pip install h11``
 

setup.py

@@ -26,9 +26,10 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: System :: Networking",
     ],