summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2019-06-21Merge branch '2.2' into 2.3Jeff Forcier
2019-06-21BlackenJeff Forcier
2019-06-21Merge branch '2.2' into 2.3Jeff Forcier
2019-06-21Add new keys and tests proving #1306Jeff Forcier
2019-06-21Changelog re #1306Jeff Forcier
2019-06-21fix ed25519 ssh key unpad() when padding not present (not needed)Pierce Lopez
fixes #1306
2019-06-14Merge branch '2.2' into 2.3Jeff Forcier
2019-06-14Merge branch '2.1' into 2.2Jeff Forcier
2019-06-14Merge branch '2.0' into 2.1Jeff Forcier
2019-06-14Seriously?Jeff Forcier
2019-06-14Merge branch '2.2' into 2.3Jeff Forcier
2019-06-14Merge branch '2.1' into 2.2Jeff Forcier
2019-06-14Merge branch '2.0' into 2.1Jeff Forcier
2019-06-14Update to modern pytest(-relaxed)Jeff Forcier
Also fix some low hanging warnings fruit
2019-05-31Merge branch '2.2' into 2.3Jeff Forcier
2019-05-31Merge branch '2.1' into 2.2Jeff Forcier
2019-05-31Merge branch '2.0' into 2.1Jeff Forcier
2019-05-31Never added 3.7 classifierJeff Forcier
2019-05-31Merge branch '2.2' into 2.3Jeff Forcier
2019-05-31Merge branch '2.1' into 2.2Jeff Forcier
2019-05-31Merge branch '2.0' into 2.1Jeff Forcier
2019-05-31Changelog re #1378, closes #1378Jeff Forcier
2019-05-31import MutableMapping from collections.abc instead of collectionsJosh Karpel
(on Python>=3.3 only)
2019-05-31Rename confusing CRYPTO_BEFORE variable.Jeff Forcier
Also, this is technically more correct, as our setup.py DOES NOT say eg 'latest crypto 1.5.x', therefore we SHOULD be testing against ==1.5 anyways...
2018-12-15Not sure why this got reverted in 2.3Jeff Forcier
2018-12-15Merge branch '2.2' into 2.3Jeff Forcier
2018-12-15Merge branch '2.1' into 2.2Jeff Forcier
2018-12-15Merge branch '2.0' into 2.1Jeff Forcier
2018-12-15GrumbleJeff Forcier
2018-12-14Merge branch '2.2' into 2.3Jeff Forcier
2018-12-14Merge branch '2.1' into 2.2Jeff Forcier
2018-12-14Merge branch '2.0' into 2.1Jeff Forcier
2018-12-14More 2.6/3.3 related dep tweaksJeff Forcier
- Setting pytest-xdist this far back was actually a mistake...ugh - But a few other things also would've popped up anyway with recent cryptography/etc releases
2018-12-14Merge branch '2.2' into 2.3Jeff Forcier
2018-12-14Merge branch '2.1' into 2.2Jeff Forcier
2018-12-14Merge branch '2.0' into 2.1Jeff Forcier
2018-12-14pycparser 2.19 dropped Python 2.6, 3.3Jeff Forcier
However Paramiko 2.0-2.3 still support those, so.
2018-12-14Merge branch '2.2' into 2.3Jeff Forcier
2018-12-14Merge branch '2.1' into 2.2Jeff Forcier
2018-12-14Merge branch '2.0' into 2.1Jeff Forcier
2018-12-14Backport some minor formatting tweaks from 2.4.xJeff Forcier
2018-12-14Merge branch '2.2' into 2.3Jeff Forcier
2018-12-14Merge branch '2.1' into 2.2Jeff Forcier
2018-12-14Merge branch '2.0' into 2.1Jeff Forcier
2018-12-14flake8 fixes after upgrading it to 3.6.0Jeff Forcier
- bare excepts weren't an error before? huh. too lazy to fix them right now though, given the rest of this code... - ambiguous variables are new; not clear why they're ambiguous besides being short. but, fixed - some wacky non-escape sequence in some awful gssapi output strings. whatever. removed
2018-12-14Merge branch '2.2' into 2.3Jeff Forcier
2018-12-14Merge branch '2.1' into 2.2Jeff Forcier
2018-12-14Merge branch '2.0' into 2.1Jeff Forcier
2018-12-14flake8 updated for Python 3.7 supportJeff Forcier
2018-12-14pin pytest-xdist to < 1.25.0Paul Kehrer
1.25.0 requires pytest >=3.6, but pytest-relaxed doesn't support pytest >3.2.x. This temporary pin can work around that issue. Without this the test suite is broken (although ultimately pytest-relaxed should be updated to support newer pytest)