summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2021-10-01 15:12:46 -0400
committerJeff Forcier <jeff@bitprophet.org>2021-10-01 22:04:36 -0400
commit985c5d0c811987a9d4d9fff712169e5125acc95a (patch)
tree0039ec3ea3c9ddf3aee64aa6a868eac0c32ca362
parent6359fb16d4d31a0ae1cdca865dd428334023a363 (diff)
README / www-index overhaul
- Nuke old README in its entirety: - We don't want people using demos if possible, stop advertising them - Nix a bunch of bits that will now be replaced by standard PyPI sidebar links (docs, tests etc) - Ditto the 'headers', most of that stuff is either PyPI metadata or the about to be added shields.io badges - Some stuff deleted was also just old, eg IRC is no longer a support channel and I think librelist is dead too - Rip out www site index for use as README and inject back in via include - Rewrite a bunch of that too for clarity - Leverage it in long_description too
-rw-r--r--README.rst174
-rw-r--r--setup.py10
-rw-r--r--sites/www/changelog.rst2
-rw-r--r--sites/www/index.rst25
4 files changed, 32 insertions, 179 deletions
diff --git a/README.rst b/README.rst
index 5fb2f77f..804d8fdb 100644
--- a/README.rst
+++ b/README.rst
@@ -1,145 +1,29 @@
-========
-Paramiko
-========
-
-.. Continuous integration and code coverage badges
-
-.. image:: https://travis-ci.org/paramiko/paramiko.svg?branch=master
- :target: https://travis-ci.org/paramiko/paramiko
-.. image:: https://codecov.io/gh/paramiko/paramiko/branch/master/graph/badge.svg
- :target: https://codecov.io/gh/paramiko/paramiko
-
-:Paramiko: Python SSH module
-:Copyright: Copyright (c) 2009 Robey Pointer <robeypointer@gmail.com>
-:Copyright: Copyright (c) 2020 Jeff Forcier <jeff@bitprophet.org>
-:License: `LGPL <https://www.gnu.org/copyleft/lesser.html>`_
-:Homepage: http://www.paramiko.org/
-:API docs: http://docs.paramiko.org
-:Development: https://github.com/paramiko/paramiko
-
-
-What
-----
-
-"Paramiko" is a combination of the Esperanto words for "paranoid" and
-"friend". It's a module for Python 2.7/3.4+ that implements the SSH2 protocol
-for secure (encrypted and authenticated) connections to remote machines. Unlike
-SSL (aka TLS), SSH2 protocol does not require hierarchical certificates signed
-by a powerful central authority. You may know SSH2 as the protocol that
-replaced Telnet and rsh for secure access to remote shells, but the protocol
-also includes the ability to open arbitrary channels to remote services across
-the encrypted tunnel (this is how SFTP works, for example).
-
-It is written entirely in Python (though it depends on third-party C wrappers
-for low level crypto; these are often available precompiled) and is released
-under the GNU Lesser General Public License (`LGPL
-<https://www.gnu.org/copyleft/lesser.html>`_).
-
-The package and its API is fairly well documented in the ``docs`` folder that
-should have come with this repository.
-
-
-Installation
-------------
-
-For most users, the recommended method to install is via pip::
-
- pip install paramiko
-
-For more detailed instructions, see the `Installing
-<http://www.paramiko.org/installing.html>`_ page on the main Paramiko website.
-
-
-Portability Issues
-------------------
-
-Paramiko primarily supports POSIX platforms with standard OpenSSH
-implementations, and is most frequently tested on Linux and OS X. Windows is
-supported as well, though it may not be as straightforward.
-
-Bugs & Support
---------------
-
-:Bug Reports: `Github <https://github.com/paramiko/paramiko/issues/>`_
-:Mailing List: ``paramiko@librelist.com`` (see the `LibreList website
- <http://librelist.com/>`_ for usage details).
-:IRC: ``#paramiko`` on Freenode
-
-
-Kerberos Support
-----------------
-
-Paramiko ships with optional Kerberos/GSSAPI support; for info on the extra
-dependencies for this, see the `GSS-API section
-<http://www.paramiko.org/installing.html#gssapi>`_
-on the main Paramiko website.
-
-
-Demo
-----
-
-Several demo scripts come with Paramiko to demonstrate how to use it.
-Probably the simplest demo is this::
-
- import base64
- import paramiko
- key = paramiko.RSAKey(data=base64.b64decode(b'AAA...'))
- client = paramiko.SSHClient()
- client.get_host_keys().add('ssh.example.com', 'ssh-rsa', key)
- client.connect('ssh.example.com', username='strongbad', password='thecheat')
- stdin, stdout, stderr = client.exec_command('ls')
- for line in stdout:
- print('... ' + line.strip('\n'))
- client.close()
-
-This prints out the results of executing ``ls`` on a remote server. The host
-key ``b'AAA...'`` should of course be replaced by the actual base64 encoding of the
-host key. If you skip host key verification, the connection is not secure!
-
-The following example scripts (in demos/) get progressively more detailed:
-
-:demo_simple.py:
- Calls invoke_shell() and emulates a terminal/TTY through which you can
- execute commands interactively on a remote server. Think of it as a
- poor man's SSH command-line client.
-
-:demo.py:
- Same as demo_simple.py, but allows you to authenticate using a private
- key, attempts to use an SSH agent if present, and uses the long form of
- some of the API calls.
-
-:forward.py:
- Command-line script to set up port-forwarding across an SSH transport.
-
-:demo_sftp.py:
- Opens an SFTP session and does a few simple file operations.
-
-:demo_server.py:
- An SSH server that listens on port 2200 and accepts a login for
- 'robey' (password 'foo'), and pretends to be a BBS. Meant to be a
- very simple demo of writing an SSH server.
-
-:demo_keygen.py:
- A key generator similar to OpenSSH ``ssh-keygen(1)`` program with
- Paramiko keys generation and progress functions.
-
-Use
----
-
-The demo scripts are probably the best example of how to use this package.
-Also a lot of documentation is generated by Sphinx autodoc, in the
-doc/ folder.
-
-There are also unit tests here::
-
- $ pip install -r dev-requirements.txt
- $ pytest
-
-Which will verify that most of the core components are working correctly.
-
-To test Kerberos/GSSAPI, you need a Kerberos environment. On UNIX you can
-use the package k5test to setup a Kerberos environment on the fly::
-
- $ pip install -r dev-requirements.txt
- $ pip install k5test gssapi pyasn1
- $ pytest
+Welcome to Paramiko!
+====================
+
+Paramiko is a pure-Python [#]_ (2.7, 3.4+) implementation of the SSHv2 protocol
+[#]_, providing both client and server functionality. It provides the
+foundation for the high-level SSH library `Fabric <https://fabfile.org>`_,
+which is what we recommend you use for common client use-cases such as running
+remote shell commands or transferring files.
+
+Direct use of Paramiko itself is only intended for users who need
+advanced/low-level primitives or want to run an in-Python sshd.
+
+For installation information, changelogs, FAQs and similar, please visit `our
+main project website <https://paramiko.org>`_; for API details, see `the
+versioned docs <https://docs.paramiko.org>`_. Additionally, the project
+maintainer keeps a `roadmap <http://bitprophet.org/projects#roadmap>`_ on his
+personal site.
+
+.. [#]
+ Paramiko relies on `cryptography <https://cryptography.io>`_ for crypto
+ functionality, which makes use of C and Rust extensions but has many
+ precompiled options available. See `our installation page
+ <https://www.paramiko.org/installing.html>`_ for details.
+
+.. [#]
+ SSH is defined in :rfc:`4251`, :rfc:`4252`, :rfc:`4253` and :rfc:`4254`. The
+ primary working implementation of the protocol is the `OpenSSH project
+ <http://openssh.org>`_. Paramiko implements a large portion of the SSH
+ feature set, but there are occasional gaps.
diff --git a/setup.py b/setup.py
index 93c08d15..428f231b 100644
--- a/setup.py
+++ b/setup.py
@@ -24,15 +24,7 @@ if sys.platform == "darwin":
setup_helper.install_custom_make_tarball()
-text = open("README.rst").read()
-long_description = """
-To find out what's new in this version of Paramiko, please see `the changelog
-<https://www.paramiko.org/changelog.html#{}>`_.
-
-{}
-""".format(
- version, text
-)
+long_description = open("README.rst").read()
# Version info -- read without importing
_locals = {}
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 8d446990..55a6a785 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -7,7 +7,7 @@ Changelog
- Migrate CI to CircleCI
- Primary dev branch is now ``main`` (renamed)
- Many README edits for clarity, modernization etc; including a bunch more
- (and consistent) status badges
+ (and consistent) status badges & unification with main project site index
- PyPI page much more fleshed out (long_description is now filled in with the
README; sidebar links expanded; etc)
- flake8, pytest configs split out of setup.cfg into their own files
diff --git a/sites/www/index.rst b/sites/www/index.rst
index 656031aa..9c3bb3aa 100644
--- a/sites/www/index.rst
+++ b/sites/www/index.rst
@@ -1,20 +1,4 @@
-Welcome to Paramiko!
-====================
-
-Paramiko is a Python (2.7, 3.4+) implementation of the SSHv2 protocol [#]_,
-providing both client and server functionality. While it leverages a Python C
-extension for low level cryptography (`Cryptography
-<https://cryptography.io>`_), Paramiko itself is a pure Python interface around
-SSH networking concepts.
-
-This website covers project information for Paramiko such as the changelog,
-contribution guidelines, development roadmap, news/blog, and so forth. Detailed
-usage and API documentation can be found at our code documentation site,
-`docs.paramiko.org <http://docs.paramiko.org>`_. Additionally, the project
-maintainer keeps a `roadmap <http://bitprophet.org/projects#roadmap>`_ on his
-website.
-
-Please see the sidebar to the left to begin.
+.. include:: ../../README.rst
.. toctree::
:hidden:
@@ -27,10 +11,3 @@ Please see the sidebar to the left to begin.
contact
-.. rubric:: Footnotes
-
-.. [#]
- SSH is defined in :rfc:`4251`, :rfc:`4252`, :rfc:`4253` and :rfc:`4254`. The
- primary working implementation of the protocol is the `OpenSSH project
- <http://openssh.org>`_. Paramiko implements a large portion of the SSH
- feature set, but there are occasional gaps.