Fix pylint/mypy

* minimal `setup.py` unification
* fix build-wheels.sh

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

Author: penguinolog

.gitignore

@@ -5,8 +5,8 @@
 /assets/*
 .cache/*
 .pytest_cache/*
-/pip-wheel-metadata
-### Versioning
+
+### Generated version
 /exec_helpers/_version.py
 
 ### Generated code

.travis.yml

@@ -1,6 +1,8 @@
-sudo: false
 language: python
 os: linux
+dist: xenial
+sudo: true
+
 install:
   - &upgrade_python_toolset pip install --upgrade pip setuptools wheel
   - &install_test_deps pip install --upgrade asynctest mock pytest pytest-mock pytest-asyncio pytest-sugar
@@ -14,8 +16,6 @@ _python:
   - &python37
     name: "Python 3.7"
     python: "3.7"
-    dist: xenial
-    sudo: true
 
 _helpers:
   - &install_cython pip install --upgrade Cython

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2016-2019 Alexey Stepanov aka penguinolog
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

MANIFEST.in

@@ -1,4 +1,5 @@
-include *.rst LICENSE requirements.txt pyproject.toml
+include *.rst LICENSE requirements.txt
+global-include *.pyx *.pxd
 global-exclude *.c
 exclude Makefile
 prune tools

doc/source/conf.py

@@ -18,7 +18,6 @@
 release = pkg_resources.get_distribution("exec-helpers").version
 version = '.'.join(release.split('.')[:2])
 
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

setup.cfg

@@ -4,6 +4,7 @@ project_urls =
   Bug Tracker = https://github.com/python-useful-helpers/exec-helpers/issues
   Documentation = https://exec-helpers.readthedocs.io/
 
+long_description = file: README.rst
 
 [options]
 zip_safe = False
@@ -23,9 +24,6 @@ all_files = 1
 build-dir = doc/build
 source-dir = doc/source
 
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [flake8]
 exclude =
   .venv,

setup.py

@@ -16,14 +16,8 @@
 
 """Execution helpers for simplified usage of subprocess and ssh."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 # Standard Library
 import ast
-import collections
 import distutils.errors
 import os.path
 import shutil
@@ -33,13 +27,22 @@
 # External Dependencies
 import setuptools
 
+try:
+    import typing
+except ImportError:
+    typing = None
+
+
 try:
     # noinspection PyPackageRequirements
     from Cython.Build import cythonize
 except ImportError:
     cythonize = None
 
-with open(os.path.join(os.path.dirname(__file__), "exec_helpers", "__init__.py")) as f:
+
+PACKAGE_NAME = "exec_helpers"
+
+with open(os.path.join(os.path.dirname(__file__), PACKAGE_NAME, "__init__.py")) as f:
     SOURCE = f.read()
 
 with open("requirements.txt") as f:
@@ -111,14 +114,13 @@ def run(self):
             root_dir = os.path.abspath(os.path.join(__file__, ".."))
             target_dir = build_dir if not self.inplace else root_dir
 
-            src_files = (os.path.join("exec_helpers", "__init__.py"),)
+            src_file = os.path.join(PACKAGE_NAME, "__init__.py")
 
-            for src_file in src_files:
-                src = os.path.join(root_dir, src_file)
-                dst = os.path.join(target_dir, src_file)
+            src = os.path.join(root_dir, src_file)
+            dst = os.path.join(target_dir, src_file)
 
-                if src != dst:
-                    shutil.copyfile(src, dst)
+            if src != dst:
+                shutil.copyfile(src, dst)
         except (
             distutils.errors.DistutilsPlatformError,
             getattr(globals()["__builtins__"], "FileNotFoundError", OSError),
@@ -142,7 +144,9 @@ def build_extension(self, ext):
 
 
 # noinspection PyUnresolvedReferences
-def get_simple_vars_from_src(src):
+def get_simple_vars_from_src(
+    src: str
+) -> "typing.Dict[str, typing.Union[str, bytes, int, float, complex, list, set, dict, tuple, None, bool, Ellipsis]]":
     """Get simple (string/number/boolean and None) assigned values from source.
 
     :param src: Source code
@@ -167,26 +171,24 @@ def get_simple_vars_from_src(src):
 
     >>> string_sample = "a = '1'"
     >>> get_simple_vars_from_src(string_sample)
-    OrderedDict([('a', '1')])
+    {'a': '1'}
 
     >>> int_sample = "b = 1"
     >>> get_simple_vars_from_src(int_sample)
-    OrderedDict([('b', 1)])
+    {'b': 1}
 
     >>> list_sample = "c = [u'1', b'1', 1, 1.0, 1j, None]"
     >>> result = get_simple_vars_from_src(list_sample)
-    >>> result == collections.OrderedDict(
-    ...     [('c', [u'1', b'1', 1, 1.0, 1j, None])]
-    ... )
+    >>> result == {'c': [u'1', b'1', 1, 1.0, 1j, None]}
     True
 
     >>> iterable_sample = "d = ([1], {1: 1}, {1})"
     >>> get_simple_vars_from_src(iterable_sample)
-    OrderedDict([('d', ([1], {1: 1}, {1}))])
+    {'d': ([1], {1: 1}, {1})}
 
     >>> multiple_assign = "e = f = g = 1"
     >>> get_simple_vars_from_src(multiple_assign)
-    OrderedDict([('e', 1), ('f', 1), ('g', 1)])
+    {'e': 1, 'f': 1, 'g': 1}
     """
     if sys.version_info[:2] < (3, 8):
         ast_data = (ast.Str, ast.Num, ast.List, ast.Set, ast.Dict, ast.Tuple, ast.Bytes, ast.NameConstant, ast.Ellipsis)
@@ -195,7 +197,7 @@ def get_simple_vars_from_src(src):
 
     tree = ast.parse(src)
 
-    result = collections.OrderedDict()
+    result = {}
 
     for node in ast.iter_child_nodes(tree):
         if not isinstance(node, ast.Assign):  # We parse assigns only
@@ -247,7 +249,7 @@ def get_simple_vars_from_src(src):
     long_description=LONG_DESCRIPTION,
     classifiers=CLASSIFIERS,
     keywords=KEYWORDS,
-    python_requires=">=3.6",
+    python_requires=">=3.6.0",
     # While setuptools cannot deal with pre-installed incompatible versions,
     # setting a lower bound is not harmful - it makes error messages cleaner. DO
     # NOT set an upper bound on setuptools, as that will lead to uninstallable
@@ -269,7 +271,7 @@ def get_simple_vars_from_src(src):
         "all_formats": XML_DEPS + LXML_DEPS + YAML_DEPS,
         "all-formats": XML_DEPS + LXML_DEPS + YAML_DEPS,
     },
-    package_data={"exec_helpers": ["py.typed"]},
+    package_data={PACKAGE_NAME: ["py.typed"]},
 )
 if cythonize is not None:
     SETUP_ARGS["ext_modules"] = EXT_MODULES

tools/build-wheels.sh

@@ -12,24 +12,24 @@ then
     exit 1
 fi
 
-arch=`uname -m`
+arch=$(uname -m)
 
 # Clean-up
 rm -rf /io/.tox
 rm -rf /io/*.egg-info
 rm -rf /io/.pytest_cache
-find -name *.py[co] -delete
+find /io/ -noleaf -name *.py[co] -delete
 
 echo
 echo
 echo "Compile wheels"
 for PYTHON in ${PYTHON_VERSIONS}; do
-    /opt/python/${PYTHON}/bin/pip install -U pip setuptools wheel
-    /opt/python/${PYTHON}/bin/pip install -r /io/build_requirements.txt
-    /opt/python/${PYTHON}/bin/pip wheel /io/ -w /io/dist/
+    /opt/python/"${PYTHON}"/bin/pip install -U pip setuptools wheel
+    /opt/python/"${PYTHON}"/bin/pip install -r /io/build_requirements.txt
+    /opt/python/"${PYTHON}"/bin/pip wheel /io/ -w /io/dist/
     cd /io
-    /opt/python/${PYTHON}/bin/python setup.py bdist_wheel
-    /opt/python/${PYTHON}/bin/python setup.py clean
+    /opt/python/"${PYTHON}"/bin/python setup.py bdist_wheel
+    /opt/python/"${PYTHON}"/bin/python setup.py clean
 done
 
 echo
@@ -52,22 +52,22 @@ ls /io/dist
 for PYTHON in ${PYTHON_VERSIONS}; do
     echo
     echo -n "Test $PYTHON: $package_name "
-    /opt/python/${PYTHON}/bin/python -c "import platform;print(platform.platform())"
-    /opt/python/${PYTHON}/bin/pip install "$package_name" --no-index -f file:///io/dist
-    /opt/python/${PYTHON}/bin/pip install asynctest pytest pytest-asyncio pytest-mock
-    /opt/python/${PYTHON}/bin/py.test -vvv /io/test
+    /opt/python/"${PYTHON}"/bin/python -c "import platform;print(platform.platform())"
+    /opt/python/"${PYTHON}"/bin/pip install "$package_name" --no-index -f file:///io/dist
+    /opt/python/"${PYTHON}"/bin/pip install pytest
+    /opt/python/"${PYTHON}"/bin/py.test -vvv /io/test
 done
 
-find /io/dist/ -type f -not -name "*$package_name*" -delete
+find /io/dist/ -noleaf -type f -not -name "*$package_name*" -delete
 rm -rf /io/.eggs
 rm -rf /io/build
 rm -rf /io/*.egg-info
 rm -rf /io/.pytest_cache
 rm -rf /io/.tox
 rm -f /io/.coverage
 # Clean caches and cythonized
-find -name *.py[co] -delete
-find -name *.c -delete
+find /io/ -noleaf -name *.py[co] -delete
+find /io/ -noleaf -name *.c -delete
 # Reset permissions
 chmod -v a+rwx /io/dist
 chmod -v a+rw /io/dist/*

tox.ini

@@ -57,7 +57,6 @@ commands = {posargs:}
 deps =
   flake8
   flake8-bugbear
-
 commands = flake8
 
 [testenv:pep257]
@@ -89,22 +88,27 @@ deps =
   sphinx
 commands = python setup.py build_sphinx
 
+[testenv:readme]
+deps =
+  readme-renderer
+commands = python setup.py check -r -s
+
 [testenv:bandit]
 deps = bandit
 commands = bandit -r exec_helpers
 
-[testenv:black]
-deps =
-  black
-commands =
-  black exec_helpers
-
 [testenv:dep-graph]
 deps =
   .
   pipdeptree
 commands = pipdeptree
 
+[testenv:black]
+deps =
+  black
+commands =
+  black exec_helpers
+
 [testenv:mypy]
 deps =
   mypy>=0.720
@@ -113,7 +117,6 @@ commands =
   python setup.py --version
   mypy --strict --xslt-html-report mypy_report -p exec_helpers
 
-
 [testenv:isort]
 deps =
   isort[pyproject,requirements]