Colin Watson
aab5ea4e53
Merge branch 'trunk' into 9737-lint-dotdotdot
2019-11-26 23:31:55 +00:00
Glyph
4ffbe9f685
Merge pull request #1200 from twisted/9735-pydoctor-deps
...
Author: glyph
Reviewer: cjwatson
Fixes: ticket:9735
Fix failing apidocs builder by allowing it to use tox dependencies normally.
2019-11-26 15:22:14 -08:00
Colin Watson
41fe30ff40
Include working tree changes too
...
`git diff trunk...` is equivalent to `git diff $(git merge-base trunk
HEAD) HEAD`, which on reflection isn't quite right here because we want
to include changes in the working tree too.
`git diff $(git merge-base trunk HEAD)` gets it right, by explicitly
comparing against the common ancestor but including any changes in the
working tree.
2019-11-24 13:46:45 +00:00
Colin Watson
a61287d547
Fix more lint
2019-11-24 13:42:22 +00:00
Colin Watson
a7cee06d81
Run pycodestyle-twisted against merge-base with trunk
...
`git diff trunk` includes changes on trunk since the common ancestor of
the current branch and trunk, which is unreasonably confusing if you're
looking at `tox -e lint` output on an out-of-date branch. Instead, use
`git diff trunk...`, which diffs against the common ancestor of the
current branch and trunk.
2019-11-24 13:16:26 +00:00
Colin Watson
06592d2fae
Fix lint
2019-11-24 12:57:35 +00:00
Colin Watson
c1992eaecb
Add curve25519-sha256 key exchange support
...
Portions of this are based on work by the0id <the0idelson@gmail.com> in
https://github.com/twisted/twisted/pull/644 .
2019-11-24 12:19:34 +00:00
Glyph
3c97fcec68
update tox.ini
2019-11-23 22:06:23 -08:00
Glyph
df019d3ef5
Merge branch 'trunk' into patch-1
2019-11-24 00:52:46 -05:00
Glyph
e7f1c46592
Merge pull request #1193 from cjwatson/9683-openssh-key-v1-encode
...
Author: cjwatson
Reviewer: glyph
Fixes: ticket:9683
twisted.conch.ssh.keys can now write private keys in the new "openssh-key-v1" format, introduced in OpenSSH 6.5 and made the default in OpenSSH 7.8. ckeygen has a corresponding new --private-key-subtype=v1 option.
2019-11-24 00:50:27 -05:00
Glyph
a432f44f83
Merge branch 'trunk' into 9683-openssh-key-v1-encode
2019-11-19 11:34:58 -05:00
Tom Most
7ad5c78d3e
Merge branch 'trunk' into attrs-cmp-deprecated-9710
2019-11-17 20:34:50 -08:00
Glyph
56a81939b5
Merge 9728-no-zero-umask: Fix some iutils tests on MacOS Catalina
...
Author: glyph
Reviewer: hawkowl
Fixes: ticket:9728
2019-11-12 20:28:16 +11:00
Glyph
d64e7e83dd
Merge branch 'trunk' into 9701-altendky-add_python_requires
2019-11-11 23:15:30 -08:00
Glyph
1c0de10a45
Merge branch 'trunk' into patch-1
2019-11-11 23:14:50 -08:00
Glyph
14984ac9b0
Merge branch 'trunk' into 9683-openssh-key-v1-encode
2019-11-11 23:14:00 -08:00
Glyph
981dd335a1
Merge 9729-pywin: Blacklist a broken pywin32 version
...
Author: hawkowl, glyph
Reviewer: hawkowl
Fixes: ticket:9729
2019-11-12 18:04:35 +11:00
Tom Most
ea50f9ce87
Depend on attrs ≥19.2.0; use eq instead of cmp
2019-11-10 20:40:19 -08:00
Amber H. Brown
021f68b082
Merge release-19.10.0-9711: Release Twisted 19.10.0
...
Author: hawkowl
Reviewer: rockstar
Fixes: ticket:9711
2019-11-11 15:17:23 +11:00
Colin Watson
8737479be1
Fix some lint
2019-11-10 21:14:26 +00:00
Mark Williams
2b389f19e8
Merge branch 'trunk' into patch-3
2019-11-10 12:36:06 -08:00
Mark Williams
08bb9166d4
Newsfragment.
2019-11-10 12:33:32 -08:00
Mark Williams
7f38dbeb49
Correct ticket.
2019-11-10 12:22:09 -08:00
Mark Williams
1e4e1f36a3
Merge branch 'trunk' into patch-2
2019-11-10 12:16:30 -08:00
Mark Williams
bc3023f332
Newsfragment.
2019-11-10 12:14:47 -08:00
Colin Watson
310d4e0e26
Add a --private-key-subtype option to ckeygen
2019-11-10 18:35:05 +00:00
Colin Watson
44b75c4db3
Use non-deprecated Key.toString arguments
2019-11-10 18:34:43 +00:00
Colin Watson
8e2ed5df9f
Emit deprecation warning from Key.toString(extra=...)
2019-11-10 16:48:41 +00:00
Glyph
c81829e7d8
Merge branch 'trunk' into 9683-openssh-key-v1-encode
2019-11-09 03:15:20 -08:00
Glyph
9c8827835f
Merge pull request #1194 from twisted/cred-docs-9724
...
Author: twm
Reviewer: glyph
Fixes: ticket:9724
The documentation of the twisted.cred.checkers module has been extended and corrected.
2019-11-08 23:48:33 -08:00
Tom Most
359e1d7039
Fix lint
2019-11-06 23:31:51 -08:00
Tom Most
4722f497e9
Newsfragment
2019-11-06 21:48:32 -08:00
Tom Most
116b1fb513
Tweaks
2019-11-06 21:42:50 -08:00
Tom Most
53d3e26aa7
Fix the type of delim
2019-11-06 21:32:14 -08:00
Tom Most
4008719a13
Improve twisted.cred.checkers docstrings
2019-11-06 21:23:18 -08:00
Tom Most
1cdf7c9b5e
Fix invalid epytext
...
Deal with this pydoctor message:
these 1 objects' docstrings are not proper epytext:
twisted.internet.testing.MemoryReactor.adoptDatagramPort
2019-11-06 19:45:46 -08:00
Anders Hovmöller
70647efdb2
Merge branch 'trunk' into patch-1
2019-10-21 16:53:53 +02:00
Colin Watson
da7d7d94de
Fix some lint in twisted.conch.test.test_keys
2019-10-21 12:22:37 +01:00
Colin Watson
d55d2a0cbd
Support encoding to new OpenSSH private key format
...
This is the other half of 4b6a2a2d85
, and
is a prerequisite for adding support for Ed25519 keys which OpenSSH only
ever writes in the new format.
OpenSSH refuses to load keys in this format that lack a trailing
newline, so I adjusted the test data accordingly.
2019-10-21 12:12:54 +01:00
Colin Watson
04230e35f4
Refactor Key._toString_OPENSSH
...
Smaller methods make this easier to understand and extend.
2019-10-21 12:10:46 +01:00
Colin Watson
1f9d14b1b3
Merge cjwatson:9682-conch-fix-ecdsa-private-blob: Fix writing of ECDSA private blob format ( #1172 )
...
Author: cjwatson
Reviewer: hawkowl
Fixes: ticket:9682
2019-10-21 14:03:16 +03:00
Thomas Westfeld
009b79eef4
Merge westfeld:9596-westfeld-correct-type-request-empty-user: Fix types in Request.getUser() and getPassword()
...
Author: westfeld
Reviewers: glyph, hawkowl
Fixes: ticket:9596
2019-10-20 21:54:41 +03:00
Colin Watson
1301454538
Merge cjwatson:9715-ftp-lint: Fix most linting issues in twisted.protocols.ftp
...
Author: cjwatson
Reviewer: hawkowl
Fixes: ticket:9715
2019-10-19 22:32:08 +03:00
Glyph
d0585e752e
Merge pull request #1175 from Gallaecio/patch-1
...
Author: Gallaecio
Reviewer: glyph
Fixes: ticket:9690
Added a missing hyphen to a reference to the ``--debug`` option of ``pdb`` in the Trial how-to.
2019-10-18 12:05:41 -07:00
Anders Hovmöller
31114e8999
Create 9707.misc
2019-10-17 16:50:37 +02:00
Glyph
21eaaed99d
Merge branch 'trunk' into patch-1
2019-10-16 17:36:08 -07:00
Glyph
7a6fb4d59d
Merge branch 'trunk' into 9646-http-header-wsp-colon
2019-10-16 17:23:49 -07:00
Glyph
5c8f6653ef
Merge branch 'trunk' into 9701-altendky-add_python_requires
2019-10-16 17:22:15 -07:00
Tom Most
0438b410d4
Merge branch 'trunk' into patch-1
2019-10-13 21:53:44 -07:00
Tom Most
35546d2b50
Merge pull request #1170 from mmattice/mmattice_doc_fix
...
Author: mmatice
Reviewer: twm
Fixes: ticket:9689
Fix some documentation in conch
2019-10-13 21:49:41 -07:00