diff --git a/.travis.yml b/.travis.yml index 600f79cd..e456e0cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ python: install: "make" # command to run tests script: + - | + if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi - make coverage after_success: - pipenv run codecov diff --git a/HISTORY.rst b/HISTORY.rst index c6123ee6..53263033 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -47,7 +47,7 @@ Release History **Bugfixes** - Much improved handling of non-ASCII ``Location`` header values in redirects. - Fewer ``UnicodeDecodeError``s are encountered on Python 2, and Python 3 now + Fewer ``UnicodeDecodeErrors`` are encountered on Python 2, and Python 3 now correctly understands that Latin-1 is unlikely to be the correct encoding. - If an attempt to ``seek`` file to find out its length fails, we now appropriately handle that by aborting our content-length calculations. diff --git a/Makefile b/Makefile index 5c2bdeb3..b45647b8 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ test: # the -k flag, like "py.test -k test_path_is_not_double_encoded" pipenv run py.test tests +test-readme: + pipenv run python setup.py check -r -s + coverage: pipenv run py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests diff --git a/Pipfile b/Pipfile index a0c28cf2..2bf3c273 100644 --- a/Pipfile +++ b/Pipfile @@ -9,5 +9,6 @@ pytest-httpbin = "==0.0.7" pytest-mock = "*" pytest-cov = "*" alabaster = "*" +readme_renderer = "*" Sphinx = "<=1.5.5" -PySocks = "*" +PySocks = "*" \ No newline at end of file