summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-181-4/+5
|\ \ \ | |/ /
| * | 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.1' into 2.2Jeff Forcier2018-09-181-1/+1
|\ \ \ | |/ /
| * | 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.1' into 2.2Jeff Forcier2018-09-181-5/+3
|\ \ \ | |/ /
| * | Merge branch '2.0' into 2.1Jeff Forcier2018-09-181-5/+3
| |\ \ | | |/
| | * FormattingJeff Forcier2018-09-181-5/+3
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-185-10/+143
|\ \ \ | |/ /
| * | 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.1' into 2.2Jeff Forcier2018-09-185-23/+80
|\ \ \ | |/ /
| * | 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
| | |/
* | | Blacken, 2.2 editionJeff Forcier2018-09-1718-106/+168
* | | Test-level fixes for pytest & friends, 2.2 editionJeff Forcier2018-09-173-15/+16
* | | Missed a spotJeff Forcier2018-09-171-6/+0
* | | Merge branch '2.1' into 2.2Jeff Forcier2018-09-1785-4134/+5112
|\ \ \ | |/ /
| * | 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
| | * Crummy workaround for 2.6/3.3 support.Jeff Forcier2018-09-171-10/+13
| | * pytest-xdist doesn't support Python 2.6Jeff Forcier2018-09-171-2/+0
| | * Blacken 2.0 with black 18.6b4Jeff Forcier2018-09-1776-3326/+4452
| | * Partial cherry pick of 57201d2de9cd4080480cfed2fe2572fa1c908acbJeff Forcier2018-09-171-1/+2
| | * Modernize travis/dev-reqs/etc re: blackeningJeff Forcier2018-09-174-5/+18
| | * Modern pypy no longer seems to sporadically fail?Jeff Forcier2018-09-171-1/+0
| | * lolJeff Forcier2018-09-171-1/+1
| | * Ignore E721 because it isn't tagged in 2.6.2, but is in 2.4.0Chris Rose2018-09-171-1/+1
| | * Test and dev dependencies cleanup and sync with FabricChris Rose2018-09-173-39/+67
| | * Pass through index option for release taskJeff Forcier2018-09-171-2/+4
| | * May have goofed up a cherry-pick earlier?Jeff Forcier2018-09-171-1/+1
| | * Non-git cherry-pick of modern pytest hints.Jeff Forcier2018-09-171-0/+7
| | * Update custom test task to encompass recent updates to invocations.pytestJeff Forcier2018-09-171-3/+30
| | * Changelog re #1291Jeff Forcier2018-09-171-0/+4
| | * Stars to dashesJeff Forcier2018-09-171-233/+233
| | * Make sure to use the coverage task on travis so it gets slow tests tooJeff Forcier2018-09-171-2/+2
| | * Mark known slow tests as 'slow' pytest marker, and skip them by defaultJeff Forcier2018-09-177-6/+28
| | * Tighten up verbose flagJeff Forcier2018-09-171-1/+1
| | * Move commentJeff Forcier2018-09-171-3/+3
| | * Try turning off session scope for sftp_server fixture.Jeff Forcier2018-09-171-1/+1
| | * Allow disabling loggingJeff Forcier2018-09-171-7/+10
View Lorry Controller Status