Commit Graph

4908 Commits

Author SHA1 Message Date
Cory Benfield 874bca97cb Disable pytest messing with warnings.
We may be able to remove this if pytest resolves pytest-dev/pytest#2430
2017-05-24 10:04:56 -07:00
kennethreitz 2772413f3d Update index.rst 2017-05-21 08:25:50 -07:00
Cory Benfield ba63e50ecd Merge pull request #4041 from jdufresne/bdist_wheel
Add setup.cfg to declare wheel as universal
2017-05-20 08:11:11 -07:00
Jon Dufresne 2c71f2d520 Add setup.cfg to declare wheel as universal
As the project is pure Python, a built wheel should always be universal,
so define in the project globally. Can remove --universal command from
Makefile.

See:

http://pythonwheels.com/
2017-05-20 07:39:09 -07:00
Cory Benfield fb3f2a030f Merge branch 'kaptajnen-master' 2017-05-18 09:05:03 -07:00
Jonas Laursen 00c6ad58b7 Simplify fix for #4025 2017-05-18 09:04:34 -07:00
Jonas Laursen af66521381 Fix #4025 2017-05-18 09:04:34 -07:00
Ian Cordasco a8bfa82801 Merge pull request #4026 from floppym/sdist-tests
Include tests in sdist tarball
2017-05-18 09:50:40 -05:00
Ian Cordasco 6ab6a18ab2 Merge pull request #4033 from Lukasa/issue/4030
Test that the readme renders in CI.
2017-05-17 20:41:00 -05:00
Ian Cordasco 570c4c83a5 Amend the syntax for skipping the readme check 2017-05-17 20:06:42 -05:00
Cory Benfield e2142a1e54 Alex said this would work 2017-05-17 18:02:28 -07:00
Ian Cordasco 52a2efa2ae Avoid verifying the README.rst on Python 2.6
readme-render does not appear to support Python 2.6. This causes tests to fail
on Travis' 2.6 environment.
2017-05-17 19:54:31 -05:00
Ian Cordasco f88e573c18 Merge branch 'master' into issue/4030 2017-05-17 19:36:49 -05:00
Cory Benfield da29295369 Merge pull request #4036 from nateprewitt/pin_sphinx
Pin sphinx
2017-05-17 15:47:48 -07:00
Nate Prewitt dbdbffd7f5 Stop creating Pipfile.lock on every make.
Pipenv used to require the file to be locked on each individual platform,
but as of v4.0.0, that is no longer necessary. Removing the forced call
to lock will speed up builds in CI.
2017-05-17 13:21:11 -07:00
Nate Prewitt a3f2972c4f Temporarily cap Sphinx at 1.5.5 for Python 2.6 compatibility 2017-05-17 13:20:19 -07:00
Cory Benfield 1553770014 Fixup broken changelog 2017-05-17 10:54:06 -07:00
Cory Benfield 37ef88885c Test the readme in travis 2017-05-17 10:46:05 -07:00
Cory Benfield 2cb07872fe Add a makefile target for testing the readme 2017-05-17 10:44:14 -07:00
Mike Gilbert 2667c772b9 Include tests in sdist tarball
Fixes: https://github.com/kennethreitz/requests/issues/4024
2017-05-16 18:59:23 -04:00
Cory Benfield 0280a18b53 Merge pull request #4015 from nateprewitt/update_manifest
remove old test_requests.py listing from MANIFEST.in
2017-05-10 20:04:03 +01:00
Nate Prewitt f4b90827b0 remove old test_requests.py listing from MANIFEST.in 2017-05-10 09:58:22 -06:00
Cory Benfield e4693eba4f v2.14.2 v2.14.2 2017-05-10 15:04:22 +01:00
Cory Benfield 2e496c3e1d Merge pull request #4014 from Lukasa/even-more-compat
Remove range operators from markers.
2017-05-10 15:02:54 +01:00
Cory Benfield f3f4c3e20a Remove range operators from markers 2017-05-10 14:19:46 +01:00
Cory Benfield 3618f3f68e v2.14.1 v2.14.1 2017-05-09 19:58:39 +01:00
Cory Benfield f909314652 Changelog for v2.14.1 2017-05-09 19:58:15 +01:00
Cory Benfield 636082fa8f Merge pull request #4007 from Lukasa/use-more-comaptible-marker
Use sys_platform instead of platform_system
2017-05-09 19:55:56 +01:00
Cory Benfield 800a074b5d Use sys_platform instead of platform_system
This is more compatible as a marker and so will break fewer people.
2017-05-09 19:10:31 +01:00
Cory Benfield 508d47dc6e v2.14.0 v2.14.0 2017-05-09 16:44:27 +01:00
Cory Benfield bf1a2a4e39 Merge pull request #4004 from Lukasa/prepare-2.14
Prepare for 2.14 release.
2017-05-09 16:42:02 +01:00
Cory Benfield ddada2d750 We no longer downcase some hosts. 2017-05-09 10:08:06 +01:00
Cory Benfield 074c4a32d8 Update certifi to 2017.4.17 2017-05-09 09:37:52 +01:00
Cory Benfield debc5de6d4 Update idna to v2.5 2017-05-09 09:36:27 +01:00
Cory Benfield 4bad52caa2 Update chardet to v3.0.2 2017-05-09 09:34:51 +01:00
Cory Benfield d49f3e258c Update urllib3 to v1.21.1 2017-05-09 09:21:08 +01:00
Cory Benfield 823519d45c Bring changelog up to date. 2017-05-09 09:18:18 +01:00
kennethreitz f8189eda10 Merge pull request #4001 from bowlofeggs/seconds
Specify that the timeout parameter is in seconds.
2017-05-07 00:07:02 -04:00
Randy Barlow 3d813c9a7a Specify that the timeout parameter is in seconds.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
2017-05-06 21:25:50 -04:00
kennethreitz 379025a1bc Update README.rst 2017-05-05 12:54:20 -04:00
kennethreitz 176ba43869 Update README.rst 2017-05-05 12:53:17 -04:00
kennethreitz 7ae662dec9 reddit 2017-05-04 11:59:36 -04:00
Cory Benfield 216aee441d Merge pull request #3979 from schlamar/bypass-proxy
improve proxy bypass on Windows
2017-05-04 15:18:30 +01:00
schlamar 5c389cf3f5 update changelog 2017-05-04 15:31:54 +02:00
schlamar 1c38e1f5f6 proxy bypass on Windows without DNS lookups 2017-05-04 10:44:47 +02:00
schlamar 4f34446b36 test proxy bypass with config from registry 2017-05-04 07:46:59 +02:00
schlamar 724fd44b97 revert 8e6e47af and c121b98c 2017-05-04 07:46:59 +02:00
kennethreitz 26ab951300 Update index.rst 2017-05-03 13:26:15 -04:00
kennethreitz eae38b8d13 Merge pull request #3988 from Lukasa/fix-appveyor
[WIP] Fix up appveyor testing.
2017-05-03 13:25:25 -04:00
Cory Benfield fcc3b7d7b1 Document the minor changes made 2017-05-03 15:28:39 +01:00