summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.1' into 2.22.2Jeff Forcier2020-01-101-2/+2
|\
| * Merge branch '2.0' into 2.12.1Jeff Forcier2020-01-101-2/+2
| |\
| | * Last ever LICENSE copyright update2.0Jeff Forcier2020-01-101-2/+2
* | | GSSAPI related kwargs were never docstring-documented -_-Jeff Forcier2019-06-211-0/+8
* | | BlackenJeff Forcier2019-06-211-2/+6
* | | Add new keys and tests proving #1306Jeff Forcier2019-06-213-0/+23
* | | Changelog re #1306Jeff Forcier2019-06-211-0/+5
* | | fix ed25519 ssh key unpad() when padding not present (not needed)Pierce Lopez2019-06-211-3/+5
* | | Merge branch '2.1' into 2.2Jeff Forcier2019-06-141-3/+0
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2019-06-141-3/+0
| |\ \ | | |/
| | * Seriously?Jeff Forcier2019-06-141-3/+0
* | | Merge branch '2.1' into 2.2Jeff Forcier2019-06-143-15/+9
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2019-06-143-15/+9
| |\ \ | | |/
| | * Update to modern pytest(-relaxed)Jeff Forcier2019-06-143-15/+9
* | | Merge branch '2.1' into 2.2Jeff Forcier2019-05-311-0/+1
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2019-05-311-0/+1
| |\ \ | | |/
| | * Never added 3.7 classifierJeff Forcier2019-05-311-0/+1
* | | Merge branch '2.1' into 2.2Jeff Forcier2019-05-312-1/+9
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2019-05-312-1/+9
| |\ \ | | |/
| | * Changelog re #1378, closes #1378Jeff Forcier2019-05-311-0/+4
| | * import MutableMapping from collections.abc instead of collectionsJosh Karpel2019-05-311-1/+5
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-12-151-2/+4
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-12-151-2/+4
| |\ \ | | |/
| | * GrumbleJeff Forcier2018-12-151-2/+4
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-12-141-4/+3
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-12-141-4/+3
| |\ \ | | |/
| | * More 2.6/3.3 related dep tweaksJeff Forcier2018-12-141-4/+3
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-12-141-0/+2
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-12-141-0/+2
| |\ \ | | |/
| | * pycparser 2.19 dropped Python 2.6, 3.3Jeff Forcier2018-12-141-0/+2
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-12-142-5/+10
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-12-142-5/+10
| |\ \ | | |/
| | * Backport some minor formatting tweaks from 2.4.xJeff Forcier2018-12-142-5/+10
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-12-145-16/+18
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-12-145-16/+18
| |\ \ | | |/
| | * flake8 fixes after upgrading it to 3.6.0Jeff Forcier2018-12-145-16/+18
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-12-141-2/+4
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-12-141-2/+4
| |\ \ | | |/
| | * flake8 updated for Python 3.7 supportJeff Forcier2018-12-141-1/+1
| | * pin pytest-xdist to < 1.25.0Paul Kehrer2018-12-141-1/+3
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-10-182-1/+2
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-10-182-1/+2
| |\ \ | | |/
| | * Tidelift callout in sidebarJeff Forcier2018-10-182-1/+2
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-10-081-1/+1
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-10-081-1/+1
| |\ \ | | |/
| | * Finally got a CVE re #1283Jeff Forcier2018-10-081-1/+1
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-181-3/+3
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-3/+3
| |\ \ | | |/
| | * MehJeff Forcier2018-09-181-3/+3
* | | Cut 2.2.42.2.4Jeff Forcier2018-09-182-1/+2