summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--setup.py2
-rw-r--r--sites/docs/api/config.rst2
-rw-r--r--sites/www/installing.rst2
4 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 079baba9..c16632b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ install:
fi
# Self-install for setup.py-driven deps (plus additional
# safe-enough-for-all-matrix-cells optional deps)
+ # TODO: additional matrices or test steps to test all the entrypoints
- pip install -e ".[ed25519,invoke]"
# Dev (doc/test running) requirements
# TODO: use poetry + whatever contexty-type stuff it has, should be more than
diff --git a/setup.py b/setup.py
index 2eb4cd46..d439fd03 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ extras_require = {
everything = []
for subdeps in extras_require.values():
everything.extend(subdeps)
-extras_require["everything"] = everything
+extras_require["all"] = everything
setup(
name="paramiko",
diff --git a/sites/docs/api/config.rst b/sites/docs/api/config.rst
index 1c3af085..ea4939b2 100644
--- a/sites/docs/api/config.rst
+++ b/sites/docs/api/config.rst
@@ -65,7 +65,7 @@ Paramiko releases) are included. A keyword by itself means no known departures.
- You must have the optional dependency Invoke installed; see :ref:`the
installation docs <paramiko-itself>` (in brief: install
- ``paramiko[invoke]`` or ``paramiko[everything]``).
+ ``paramiko[invoke]`` or ``paramiko[all]``).
- As usual, connection-time information is not present during config
lookup, and thus cannot be used to determine matching. This primarily
impacts ``Match user``, which can match against loaded ``User`` values
diff --git a/sites/www/installing.rst b/sites/www/installing.rst
index 4b2680a4..f2d9a341 100644
--- a/sites/www/installing.rst
+++ b/sites/www/installing.rst
@@ -36,7 +36,7 @@ There are also a number of **optional dependencies** you may install using
.. TODO 3.0: tweak the invoke line to mention proxycommand too
.. TODO 3.0: tweak the ed25519 line to remove the caveat
-- If you want all optional dependencies at once, use ``paramiko[everything]``.
+- If you want all optional dependencies at once, use ``paramiko[all]``.
- For ``Match exec`` config support, use ``paramiko[invoke]`` (which installs
`Invoke <https://www.pyinvoke.org>`_).
- For GSS-API / SSPI support, use ``paramiko[gssapi]``, though also see