Upgrade (#398)

* Fixed issue with stdin flush for libssh clients
* Updated changelog
* Updated sshd template
* Updated versioneer
* Updated logging
* Refactored tests, imports
* Updated CI cfg
* Updated docstrings
* Updated imports
* Updated readme
* Prettify tests

Author: pkittenis

.circleci/config.yml

@@ -1,21 +1,16 @@
 version: 2.1
 
-orbs:
-  python: circleci/python@0.3.2
 
 jobs:
   python_test:
     parameters:
       python_ver:
         type: string
-        default: "3.6"
+        default: "3.10"
     docker:
-      - image: circleci/python:<< parameters.python_ver >>
+      - image: cimg/python:<< parameters.python_ver >>
     steps:
       - checkout
-      - python/load-cache:
-          dependency-file: requirements_dev.txt
-          key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           name: Deps
           command: |
@@ -24,23 +19,25 @@ jobs:
       - run:
           command: |
             pip install -U -r requirements_dev.txt
+            set -x
+            eval "$(ssh-agent -s)"
           name: Build
-      - python/save-cache:
-          dependency-file: requirements_dev.txt
-          key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           command: |
             python setup.py check --restructuredtext
           name: Check readme
       - run:
           command: |
             flake8 pssh
+            flake8 tests ci/integration_tests
           name: flake
       - run:
           command: |
-            set -x
-            eval "$(ssh-agent -s)"
             pytest
+          name: Test
+      - run:
+          command: |
+            pytest ci/integration_tests
           name: Integration tests
       - run:
           command: |
@@ -59,22 +56,16 @@ jobs:
 
   release:
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.10
     steps:
       - checkout
-      - python/load-cache:
-          key: releasedepsv1-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements.txt
       - run:
           name: Deps
           command: |
             sudo apt-get update
             sudo apt-get install python3-pip
             pip install -U pip
             pip install -U twine
-      - python/save-cache:
-          key: releasedepsv1-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements.txt
       - run:
           name: Build Wheels/Source Dist
           command: |
@@ -94,10 +85,10 @@ workflows:
           matrix:
             parameters:
               python_ver:
-                - "3.6"
                 - "3.8"
-                - "3.9"
                 - "3.10"
+                - "3.11"
+                - "3.12"
           filters:
             tags:
               ignore: /.*/

.codecov.yml

@@ -9,3 +9,4 @@ coverage:
 ignore:
   - "embedded_server/.*"
   - "tests/.*"
+  - "ci/integration_tests/.*"

.gitignore

@@ -45,7 +45,7 @@ pypy
 # Documentation builds
 doc/_build
 
-tests/unit_test_cert_key-cert.pub
-tests/embedded_server/principals
-tests/embedded_server/sshd_config_*
-tests/embedded_server/*.pid
+ci/integration_tests/int_test_cert_key-cert.pub
+ci/integration_tests/embedded_server/principals
+ci/integration_tests/embedded_server/sshd_config_*
+ci/integration_tests/embedded_server/*.pid

Changelog.rst

@@ -1,6 +1,25 @@
 Change Log
 ============
 
+
+2.13.0
++++++++
+
+Changes
+-------
+
+* Minimum version updates for ``ssh2-python`` and `ssh-python``.
+* Added support for Python 3.12+, removed support for Python <3.8.
+* Package tests under top level ``tests`` directory are now cross platform and may be run by vendors.
+  Project CI specific ntegration tests moved into their own space.
+
+
+Fixes
+------
+
+* Calling ``HostOutput.stdin.flush`` with a ``pssh.clients.ssh`` client would raise exception.
+
+
 2.12.0
 +++++++
 

MANIFEST.in

@@ -3,4 +3,12 @@ include pssh/_version.py
 include LICENSE
 include COPYING
 include COPYING.LESSER
+exclude .codecov.yml
+exclude .coveragerc
+exclude .git*
+exclude .pre-commit*
+exclude .readthedocs.yml
 recursive-exclude tests *
+recursive-exclude ci *
+recursive-exclude .circleci *
+recursive-exclude .github *

README.rst

@@ -25,6 +25,7 @@ Native code based clients with extremely high performance, making use of C libra
   :alt: Latest documentation
 
 .. _`read the docs`: https://parallel-ssh.readthedocs.org/en/latest/
+.. _`SFTP and SCP documentation`: https://parallel-ssh.readthedocs.io/en/latest/advanced.html#sftp-scp
 
 ************
 Installation
@@ -239,7 +240,7 @@ To copy a local file to remote hosts in parallel with SCP:
   cmds = client.scp_send('../test', 'test_dir/test')
   joinall(cmds, raise_error=True)
 
-See `SFTP and SCP documentation <https://parallel-ssh.readthedocs.io/en/latest/advanced.html#sftp-scp>`_ for more examples.
+See `SFTP and SCP documentation`_ for more examples.
 
 
 *****
@@ -275,8 +276,4 @@ In addition, per-host configurable file name functionality is provided for both
 
 Directory recursion is supported in both cases via the ``recurse`` parameter - defaults to off.
 
-See `SFTP and SCP documentation <https://parallel-ssh.readthedocs.io/en/latest/advanced.html#sftp-scp>`_ for more examples.
-
-
-.. image:: https://ga-beacon.appspot.com/UA-9132694-7/parallel-ssh/README.rst?pixel
-  :target: https://github.com/igrigorik/ga-beacon
+See `SFTP and SCP documentation`_ for more examples.