summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix rtdversionKenneth Reitz2017-05-251-1/+1
* take a page out of @sigmavirus42's bookKenneth Reitz2017-05-251-6/+6
* take a page out of @sigmavirus42's bookKenneth Reitz2017-05-251-0/+3
* better ''Kenneth Reitz2017-05-251-1/+1
* __version__.pyKenneth Reitz2017-05-253-15/+20
* Update README.rstKenneth Reitz2017-05-251-1/+0
* Merge pull request #4056 from Lukasa/pytest-httpbin-fixCory Benfield2017-05-243-2/+4
|\
| * Turns out @kennethreitz suprise-broke the CICory Benfield2017-05-241-1/+1
| * Disable pytest messing with warnings.Cory Benfield2017-05-242-1/+3
* | Update __init__.pyKenneth Reitz2017-05-241-3/+4
* | progressKenneth Reitz2017-05-221-2/+2
* | progressKenneth Reitz2017-05-221-3/+2
* | fix lack of tasteKenneth Reitz2017-05-211-1/+1
|/
* Update index.rstKenneth Reitz2017-05-211-1/+1
* Merge pull request #4041 from jdufresne/bdist_wheelCory Benfield2017-05-202-2/+3
|\
| * Add setup.cfg to declare wheel as universalJon Dufresne2017-05-202-2/+3
|/
* Merge branch 'kaptajnen-master'Cory Benfield2017-05-182-0/+5
|\
| * Simplify fix for #4025Jonas Laursen2017-05-181-32/+33
| * Fix #4025Jonas Laursen2017-05-182-32/+36
|/
* Merge pull request #4026 from floppym/sdist-testsIan Cordasco2017-05-181-0/+1
|\
| * Include tests in sdist tarballMike Gilbert2017-05-161-0/+1
* | Merge pull request #4033 from Lukasa/issue/4030Ian Cordasco2017-05-174-2/+8
|\ \
| * | Amend the syntax for skipping the readme checkIan Cordasco2017-05-171-1/+1
| * | Alex said this would workCory Benfield2017-05-171-1/+2
| * | Avoid verifying the README.rst on Python 2.6Ian Cordasco2017-05-171-1/+1
| * | Merge branch 'master' into issue/4030Ian Cordasco2017-05-173-117/+79
| |\ \ | |/ / |/| |
* | | Merge pull request #4036 from nateprewitt/pin_sphinxCory Benfield2017-05-173-117/+79
|\ \ \ | |_|/ |/| |
| * | Stop creating Pipfile.lock on every make.Nate Prewitt2017-05-171-1/+0
| * | Temporarily cap Sphinx at 1.5.5 for Python 2.6 compatibilityNate Prewitt2017-05-172-116/+79
|/ /
| * Fixup broken changelogCory Benfield2017-05-171-1/+1
| * Test the readme in travisCory Benfield2017-05-171-0/+1
| * Add a makefile target for testing the readmeCory Benfield2017-05-172-0/+4
|/
* Merge pull request #4015 from nateprewitt/update_manifestCory Benfield2017-05-101-1/+1
|\
| * remove old test_requests.py listing from MANIFEST.inNate Prewitt2017-05-101-1/+1
|/
* v2.14.2v2.14.2Cory Benfield2017-05-102-2/+10
* Merge pull request #4014 from Lukasa/even-more-compatCory Benfield2017-05-101-1/+1
|\
| * Remove range operators from markersCory Benfield2017-05-101-1/+1
|/
* v2.14.1v2.14.1Cory Benfield2017-05-091-2/+2
* Changelog for v2.14.1Cory Benfield2017-05-091-2/+10
* Merge pull request #4007 from Lukasa/use-more-comaptible-markerCory Benfield2017-05-091-1/+1
|\
| * Use sys_platform instead of platform_systemCory Benfield2017-05-091-1/+1
|/
* v2.14.0v2.14.0Cory Benfield2017-05-091-2/+2
* Merge pull request #4004 from Lukasa/prepare-2.14Cory Benfield2017-05-0965-4861/+5919
|\
| * We no longer downcase some hosts.Cory Benfield2017-05-092-6/+8
| * Update certifi to 2017.4.17Cory Benfield2017-05-092-269/+241
| * Update idna to v2.5Cory Benfield2017-05-094-1575/+1583
| * Update chardet to v3.0.2Cory Benfield2017-05-0944-2871/+2028
| * Update urllib3 to v1.21.1Cory Benfield2017-05-0918-139/+2037
| * Bring changelog up to date.Cory Benfield2017-05-091-2/+23
|/
* Merge pull request #4001 from bowlofeggs/secondsKenneth Reitz2017-05-071-1/+1
|\