summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.0' into 2.12.1Jeff Forcier2020-01-101-2/+2
|\
| * Last ever LICENSE copyright update2.0Jeff Forcier2020-01-101-2/+2
* | Merge branch '2.0' into 2.1Jeff Forcier2019-06-141-3/+0
|\ \ | |/
| * Seriously?Jeff Forcier2019-06-141-3/+0
* | 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.0' into 2.1Jeff Forcier2019-05-311-0/+1
|\ \ | |/
| * Never added 3.7 classifierJeff Forcier2019-05-311-0/+1
* | 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.0' into 2.1Jeff Forcier2018-12-151-2/+4
|\ \ | |/
| * GrumbleJeff Forcier2018-12-151-2/+4
* | 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.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.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.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.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.0' into 2.1Jeff Forcier2018-10-182-1/+2
|\ \ | |/
| * Tidelift callout in sidebarJeff Forcier2018-10-182-1/+2
* | 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.0' into 2.1Jeff Forcier2018-09-181-3/+3
|\ \ | |/
| * MehJeff Forcier2018-09-181-3/+3
* | Cut 2.1.62.1.6Jeff Forcier2018-09-182-1/+2
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-4/+4
|\ \ | |/
| * Cut 2.0.92.0.9Jeff Forcier2018-09-182-1/+2
| * Almost left the 1.17+ marker in the changelog.Jeff Forcier2018-09-181-4/+3
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-1/+1
|\ \ | |/
| * Fix a Python 2.6 oopsJeff Forcier2018-09-181-1/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-5/+3
|\ \ | |/
| * FormattingJeff Forcier2018-09-181-5/+3
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-185-10/+143
|\ \ | |/
| * Fix and changelog re #1283Jeff Forcier2018-09-183-5/+94
| * Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itselfJeff Forcier2018-09-184-5/+49
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-185-23/+80
|\ \ | |/
| * Merge branch 'crypto-1.5-agnostisicm' into 2.0Jeff Forcier2018-09-185-22/+79
| |\
| | * Backport support for newer cryptography sign/verify APIs.crypto-1.5-agnostisicmJeff Forcier2018-09-184-22/+61
| | * Try testing against different cryptography.io versionsJeff Forcier2018-09-181-0/+18
| * | Missing verbose/color for 2.6/3.3 backported pytest setupJeff Forcier2018-09-181-1/+1
| |/
* | One change overlooked by merge, as it's newJeff Forcier2018-09-171-1/+1
* | Blacken 2.1 branchJeff Forcier2018-09-173-32/+37
* | Merge branch '2.0' into 2.1Jeff Forcier2018-09-1785-4143/+5127
|\ \ | |/
| * Throwing a bone to 2.0-2.3 python-2.6 supportJeff Forcier2018-09-172-2/+2
View Lorry Controller Status