Backport from newer pythons

* `usedevelop = False`,
   do not use pip for develop install due to PEP0517
* fix codestyle
* fresh mypy
* travis movement

Signed-off-by: Aleksei Stepanov <penguinolog@gmail.com>

Author: penguinolog

.editorconfig

@@ -3,16 +3,17 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 4
+indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{py,ini}]
+[*.{py,pyx,pxd,pyi}]
+indent_size = 4
 max_line_length = 120
 
-[*.{yml,yaml,rst}]
-indent_size = 2
+[*.rst]
+max_line_length = 150
 
 [Makefile]
 indent_style = tab

.travis.yml

@@ -2,108 +2,108 @@ sudo: false
 language: python
 os: linux
 install:
-- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
-- pip install --upgrade pytest pytest-mock pytest-sugar
-- &install_deps pip install -r CI_REQUIREMENTS.txt
-- pip install --upgrade pytest-cov coveralls
+  - &upgrade_python_toolset pip install --upgrade pip setuptools wheel
+  - pip install --upgrade pytest pytest-mock pytest-sugar
+  - &install_deps pip install -r CI_REQUIREMENTS.txt
+  - pip install --upgrade pytest-cov coveralls
 
 _python:
-- &python27
-  name: "Python 2.7"
-  python: "2.7"
-- &pypy
-  name: "PyPy"
-  python: "pypy"
-- &python37
-  name: "Python 3.7"
-  python: "3.7"
-  dist: xenial
-  sudo: true
+  - &python27
+    name: "Python 2.7"
+    python: "2.7"
+  - &pypy
+    name: "PyPy"
+    python: "pypy"
+  - &python37
+    name: "Python 3.7"
+    python: "3.7"
+    dist: xenial
+    sudo: true
 
 _helpers:
-- &build_package python setup.py bdist_wheel
+  - &build_package python setup.py bdist_wheel
 
-- &static_analysis
-  stage: Static analysis
-  <<: *python27
-  after_success: skip
+  - &static_analysis
+    stage: Static analysis
+    <<: *python27
+    after_success: skip
 
-- &code_style_check
-  stage: Code style check
-  <<: *python27
-  after_success: skip
+  - &code_style_check
+    stage: Code style check
+    <<: *python27
+    after_success: skip
 
 script:
-- pip install -e .
-- py.test -vv --cov-config .coveragerc --cov-report= --cov=exec_helpers test
-- coverage report -m --fail-under 87
+  - python setup.py develop -v
+  - py.test -vvv --cov-config .coveragerc --cov-report= --cov=exec_helpers test
+  - coverage report -m --fail-under 87
 after_success:
-- coveralls
+  - coveralls
 
 jobs:
   include:
-  - <<: *static_analysis
-    name: "PyLint"
-    install:
-    - *upgrade_python_toolset
-    - *install_deps
-    - pip install --upgrade "pylint < 2.0"
-    script:
-    - pylint exec_helpers
-  - <<: *static_analysis
-    name: "Bandit"
-    install:
-    - *upgrade_python_toolset
-    - pip install --upgrade bandit
-    script:
-    - bandit -r exec_helpers
-  - <<: *static_analysis
-    name: "PEP8"
-    install:
-    - *upgrade_python_toolset
-    - pip install --upgrade flake8
-    script:
-    - flake8
+    - <<: *static_analysis
+      name: "PyLint"
+      install:
+        - *upgrade_python_toolset
+        - *install_deps
+        - pip install --upgrade "pylint < 2.0"
+      script:
+        - pylint exec_helpers
+    - <<: *static_analysis
+      name: "Bandit"
+      install:
+        - *upgrade_python_toolset
+        - pip install --upgrade bandit
+      script:
+        - bandit -r exec_helpers
+    - <<: *static_analysis
+      name: "PEP8"
+      install:
+        - *upgrade_python_toolset
+        - pip install --upgrade flake8
+      script:
+        - flake8
 
-#  - <<: *code_style_check
-#    name: "PEP257"
-#    install:
-#    - *upgrade_python_toolset
-#    - pip install --upgrade pydocstyle
-#    script:
-#    - pydocstyle -v exec_helpers
+    #  - <<: *code_style_check
+    #    name: "PEP257"
+    #    install:
+    #    - *upgrade_python_toolset
+    #    - pip install --upgrade pydocstyle
+    #    script:
+    #    - pydocstyle -v exec_helpers
 
-  - stage: test
-    <<: *python27
-  - stage: test
-    <<: *pypy
+    - stage: test
+      <<: *python27
+    - stage: test
+      <<: *pypy
 
-  - stage: deploy
-    # This prevents job from appearing in test plan unless commit is tagged:
-    if: tag IS present
-    <<: *pypy
-    name: Build universal bdist_wheel. Deploy bdist and sdist.
-    services: []
-    install:
-    - *upgrade_python_toolset
-    - pip install -r build_requirements.txt
-    script:
-    - *build_package
-    before_deploy: []
-    deploy:
-    - provider: pypi
-      # `skip_cleanup: true` is required to preserve binary wheels, built
-      # inside of manylinux1 docker container during `script` step above.
-      skip_cleanup: true
-      user: penguinolog
-      password:
-        secure: "maml4+SU/6NtRf7JIwWhVyXkesE9Gk5Umdo3txOjcrcvt84S3NlN/hFgdNclMUpJ3b+rOFEpiZOamtDKbP67uhlA6yJ364SxW5T3ZQJ8tjFFzMHcaM38HgGbgLR8AxK8fdZKRg9gVMnGofeiusB5aNsKmn9XnvESc8dNv0Umdmi83wXxm+DfVRXL8VTFgwsH3BxQy/Kdv6upRrXyNWkyoi8Zk8PkrFFDpFoW9WK1fRBqnvCw1Wt8nEAJah7y2b7vj52eM+MfT3IL+jpocZqOJQlFPdWkTonX7mAP9nB97kk4DMbm3ZqUw2Qr9pM0nKK9HhrXhsSSUGa1w95zmw9nbXLrpfnQ61Lyk9pGcVh60WbrVKstE/x9Lq3pqGsA/YKqsIZK3OAqRfBHNG9L7lekP05hXyDNHJXGoEyGQjVA/666S2ZCjM10XaaUmZ5P1kPGocCnEjv86dKdINTkFM6L0n4oIu1nyftBhVu9jz0xQaxute4LZNJiQtE6x8NX3WuSO68UhWjDqevYdRgW55Gp1OD4ilfA/SVNPpsHJfB2baue1fi9m8Rn3bWQSJoZ8twYHoIxEOAIXyMBhYnmldvsuUY6h5p+/hk6kpJAsTXZFjUSa/FPIH84QvDkNCoZxwInSkjEN1tj9PBep2vYcLMd92+g6udtin8FbYMZItiDl1M="
-      on:
-        tags: true
-        distributions: sdist
-      skip_upload_docs: true
-      skip_existing: true
+    - stage: deploy
+      # This prevents job from appearing in test plan unless commit is tagged:
+      if: tag IS present
+      <<: *pypy
+      name: Build universal bdist_wheel. Deploy bdist and sdist.
+      services: []
+      install:
+        - *upgrade_python_toolset
+        - pip install -r build_requirements.txt
+      script:
+        - *build_package
+      before_deploy: []
+      deploy:
+        - provider: pypi
+          # `skip_cleanup: true` is required to preserve binary wheels, built
+          # inside of manylinux1 docker container during `script` step above.
+          skip_cleanup: true
+          user: penguinolog
+          password:
+            secure: "maml4+SU/6NtRf7JIwWhVyXkesE9Gk5Umdo3txOjcrcvt84S3NlN/hFgdNclMUpJ3b+rOFEpiZOamtDKbP67uhlA6yJ364SxW5T3ZQJ8tjFFzMHcaM38HgGbgLR8AxK8fdZKRg9gVMnGofeiusB5aNsKmn9XnvESc8dNv0Umdmi83wXxm+DfVRXL8VTFgwsH3BxQy/Kdv6upRrXyNWkyoi8Zk8PkrFFDpFoW9WK1fRBqnvCw1Wt8nEAJah7y2b7vj52eM+MfT3IL+jpocZqOJQlFPdWkTonX7mAP9nB97kk4DMbm3ZqUw2Qr9pM0nKK9HhrXhsSSUGa1w95zmw9nbXLrpfnQ61Lyk9pGcVh60WbrVKstE/x9Lq3pqGsA/YKqsIZK3OAqRfBHNG9L7lekP05hXyDNHJXGoEyGQjVA/666S2ZCjM10XaaUmZ5P1kPGocCnEjv86dKdINTkFM6L0n4oIu1nyftBhVu9jz0xQaxute4LZNJiQtE6x8NX3WuSO68UhWjDqevYdRgW55Gp1OD4ilfA/SVNPpsHJfB2baue1fi9m8Rn3bWQSJoZ8twYHoIxEOAIXyMBhYnmldvsuUY6h5p+/hk6kpJAsTXZFjUSa/FPIH84QvDkNCoZxwInSkjEN1tj9PBep2vYcLMd92+g6udtin8FbYMZItiDl1M="
+          on:
+            tags: true
+            distributions: sdist
+          skip_upload_docs: true
+          skip_existing: true
 
 cache: pip
 before_cache:
-- rm -f $HOME/.cache/pip/log/debug.log
+  - rm -f $HOME/.cache/pip/log/debug.log

README.rst

@@ -1,8 +1,8 @@
 exec-helpers
 ============
 
-.. image:: https://travis-ci.org/python-useful-helpers/exec-helpers.svg?branch=master
-    :target: https://travis-ci.org/python-useful-helpers/exec-helpers
+.. image:: https://travis-ci.com/python-useful-helpers/exec-helpers.svg?branch=master
+    :target: https://travis-ci.com/python-useful-helpers/exec-helpers
 .. image:: https://coveralls.io/repos/github/python-useful-helpers/exec-helpers/badge.svg?branch=master
     :target: https://coveralls.io/github/python-useful-helpers/exec-helpers?branch=master
 .. image:: https://readthedocs.org/projects/exec-helpers/badge/?version=latest
@@ -25,8 +25,10 @@ you can call command with timeout, but without receiving return code,
 or call command and wait for return code, but without timeout processing.
 
 In the most cases, we are need just simple SSH client with comfortable API for calls, calls via SSH proxy and checking return code/stderr.
-This library offers this functionality with connection memorizing, deadlock free polling and friendly result objects (with inline decoding of YAML, JSON, binary or just strings).
-In addition this library offers the same API for subprocess calls, but with specific limitation: no parallel calls (for protection from race conditions).
+This library offers this functionality with connection memorizing, deadlock free polling and friendly result objects
+(with inline decoding of YAML, JSON, binary or just strings).
+In addition this library offers the same API for subprocess calls, but with specific limitation: no parallel calls
+(for protection from race conditions).
 
 Pros:
 
@@ -96,7 +98,7 @@ Creation from scratch:
     )
 
 Key is a main connection key (always tried first) and keys are alternate keys.
-Key filename is a filename or list of filenames with keys, which should be loaded.
+Key filename is afilename or list of filenames with keys, which should be loaded.
 Passphrase is an alternate password for keys, if it differs from main password.
 If main key now correct for username - alternate keys tried, if correct key found - it became main.
 If no working key - password is used and None is set as main key.
@@ -116,7 +118,7 @@ Base methods
 ------------
 Main methods are `execute`, `check_call` and `check_stderr` for simple executing, executing and checking return code
 and executing, checking return code and checking for empty stderr output.
-This methods are almost the same for `SSHCleint` and `Subprocess`, except specific flags.
+This methods are almost the same for `SSHClient` and `Subprocess`, except specific flags.
 
 .. note:: By default ALL methods have timeout 1 hour, infinite waiting can be enabled, but it's special case.
 
@@ -166,7 +168,7 @@ If no STDOUT or STDERR required, it is possible to disable this FIFO pipes via `
 The next command level uses lower level and kwargs are forwarded, so expected exit codes are forwarded from `check_stderr`.
 Implementation specific flags are always set via kwargs.
 
-If required to mask part of command from logging, `log_mask_re` attribute can be set global over instance or providden with command.
+If required to mask part of command from logging, `log_mask_re` attribute can be set global over instance or provided with command.
 All regex matched groups will be replaced by `'<*masked*>'`.
 
 .. code-block:: python
@@ -327,6 +329,6 @@ CI systems
 ==========
 For code checking several CI systems is used in parallel:
 
-1. `Travis CI: <https://travis-ci.org/python-useful-helpers/exec-helpers>`_ is used for checking: PEP8, pylint, bandit, installation possibility and unit tests. Also it's publishes coverage on coveralls.
+1. `Travis CI: <https://travis-ci.com/python-useful-helpers/exec-helpers>`_ is used for checking: PEP8, pylint, bandit, installation possibility and unit tests. Also it's publishes coverage on coveralls.
 
 2. `coveralls: <https://coveralls.io/github/python-useful-helpers/exec-helpers>`_ is used for coverage display.

exec_helpers/__init__.py

@@ -16,26 +16,25 @@
 
 from __future__ import absolute_import
 
+# External Dependencies
 import pkg_resources
 
-from .proc_enums import ExitCodes
-
-from .exceptions import (
-    ExecHelperError,
-    ExecCalledProcessError,
-    CalledProcessError,
-    ParallelCallProcessError,
-    ParallelCallExceptions,
-    ExecHelperNoKillError,
-    ExecHelperTimeoutError,
-)
-
+# Local Implementation
+from ._ssh_client_base import SshExecuteAsyncResult
 from .api import ExecHelper
+from .exceptions import CalledProcessError
+from .exceptions import ExecCalledProcessError
+from .exceptions import ExecHelperError
+from .exceptions import ExecHelperNoKillError
+from .exceptions import ExecHelperTimeoutError
+from .exceptions import ParallelCallExceptions
+from .exceptions import ParallelCallProcessError
 from .exec_result import ExecResult
+from .proc_enums import ExitCodes
 from .ssh_auth import SSHAuth
 from .ssh_client import SSHClient
-from ._ssh_client_base import SshExecuteAsyncResult
-from .subprocess_runner import Subprocess, SubprocessExecuteAsyncResult  # nosec  # Expected
+from .subprocess_runner import Subprocess  # nosec  # Expected
+from .subprocess_runner import SubprocessExecuteAsyncResult  # nosec  # Expected
 
 __all__ = (
     "ExecHelperError",

exec_helpers/_ssh_client_base.py

@@ -20,9 +20,9 @@
 from __future__ import division
 from __future__ import unicode_literals
 
+# Standard Library
 import abc
 import base64
-
 # noinspection PyCompatibility
 import concurrent.futures
 import copy
@@ -35,19 +35,21 @@
 import typing  # noqa: F401  # pylint: disable=unused-import
 import warnings
 
+# External Dependencies
 import advanced_descriptors
 import paramiko  # type: ignore
+import six
 import tenacity  # type: ignore
 import threaded
-import six
 
+# Exec-Helpers Implementation
+from exec_helpers import _log_templates
 from exec_helpers import api
 from exec_helpers import constants
-from exec_helpers import exec_result
 from exec_helpers import exceptions
+from exec_helpers import exec_result
 from exec_helpers import proc_enums
 from exec_helpers import ssh_auth
-from exec_helpers import _log_templates
 
 __all__ = ("SSHClientBase", "SshExecuteAsyncResult")
 
@@ -119,7 +121,7 @@ def __call__(  # type: ignore
         password=None,  # type: typing.Optional[typing.Union[str, typing.Text]]
         private_keys=None,  # type: typing.Optional[typing.Iterable[paramiko.RSAKey]]
         auth=None,  # type: typing.Optional[ssh_auth.SSHAuth]
-        verbose=True  # type: bool
+        verbose=True,  # type: bool
     ):  # type: (...) -> SSHClientBase
         """Main memorize method: check for cached instance and return it.
 
@@ -574,7 +576,7 @@ def execute_async(
         """
         cmd_for_log = self._mask_command(cmd=command, log_mask_re=log_mask_re)
 
-        self.logger.log(  # type: ignore
+        self.logger.log(
             level=logging.INFO if verbose else logging.DEBUG, msg=_log_templates.CMD_EXEC.format(cmd=cmd_for_log)
         )
 
@@ -740,7 +742,7 @@ def execute_through_host(
         .. versionchanged:: 1.2.0 log_mask_re regex rule for masking cmd
         """
         cmd_for_log = self._mask_command(cmd=command, log_mask_re=kwargs.get("log_mask_re", None))
-        self.logger.log(  # type: ignore
+        self.logger.log(
             level=logging.INFO if verbose else logging.DEBUG, msg=_log_templates.CMD_EXEC.format(cmd=cmd_for_log)
         )