Mass backport from py34+

* setuptools_scm
* allow py3 (only for compatibility reasons: py3 versions are better)
* fix mypy

Signed-off-by: Aleksei Stepanov <[email protected]>

Author: penguinolog

.travis.yml

@@ -11,12 +11,26 @@ _python:
 - &python27
   name: "Python 2.7"
   python: 2.7
-- &python36
-  name: "Python 3.6"
-  python: 3.6
 - &pypy
   name: "PyPy"
   python: pypy
+- &python34
+  name: "Python 3.4"
+  python: "3.4"
+- &python35
+  name: "Python 3.5"
+  python: "3.5"
+- &python36
+  name: "Python 3.6"
+  python: "3.6"
+- &python37
+  name: "Python 3.7"
+  python: "3.7"
+  dist: xenial
+  sudo: true
+- &pypy3
+  name: "PyPy3"
+  python: "pypy3.5"
 
 _helpers:
 - &build_package python setup.py bdist_wheel
@@ -41,11 +55,6 @@ after_success:
 jobs:
   fast_finish: true
   include:
-  - stage: test
-    <<: *python27
-  - stage: test
-    <<: *pypy
-
   - <<: *static_analysis
     name: "PyLint"
     install:
@@ -85,6 +94,21 @@ jobs:
     script:
     - pydocstyle advanced_descriptors
 
+  - stage: test
+    <<: *python27
+  - stage: test
+    <<: *pypy
+  - stage: test
+    <<: *python34
+  - stage: test
+    <<: *python35
+  - stage: test
+    <<: *python36
+  - stage: test
+    <<: *python37
+  - stage: test
+    <<: *pypy3
+
   - stage: deploy
     # This prevents job from appearing in test plan unless commit is tagged:
     if: tag IS present
@@ -109,6 +133,7 @@ jobs:
         tags: true
         distributions: sdist
       skip_upload_docs: true
+      skip_existing: true
 
 cache: pip
 before_cache:

advanced_descriptors/__init__.py

@@ -13,12 +13,22 @@
 
 """Advanced descriptors for special cases."""
 
+import pkg_resources
+
 from .separate_class_method import SeparateClassMethod
 from .advanced_property import AdvancedProperty
 
-__all__ = ("SeparateClassMethod", "AdvancedProperty")
+try:
+    __version__ = pkg_resources.get_distribution(__name__).version
+except pkg_resources.DistributionNotFound:
+    # package is not installed, try to get from SCM
+    try:
+        import setuptools_scm  # type: ignore
+
+        __version__ = setuptools_scm.get_version()
+    except ImportError:
+        pass
 
-__version__ = "1.0.7"
 __author__ = "Alexey Stepanov"
 __author_email__ = "[email protected]"
 __maintainers__ = {

advanced_descriptors/advanced_property.py

@@ -15,10 +15,10 @@
 
 """Property with class-wide getter."""
 
-import typing  # noqa: F401  # pylint: disable=unused-import
-
 __all__ = ("AdvancedProperty",)
 
+import typing  # noqa: F401  # pylint: disable=unused-import
+
 
 class AdvancedProperty(object):
     """Property with class-wide getter.

advanced_descriptors/separate_class_method.py

@@ -15,12 +15,12 @@
 
 """Separate class and instance methods with the same name."""
 
+__all__ = ("SeparateClassMethod",)
+
 import typing  # noqa: F401  # pylint: disable=unused-import
 
 import six
 
-__all__ = ("SeparateClassMethod",)
-
 
 class SeparateClassMethod(object):
     """Separate class method and instance methods with the same name.
@@ -93,8 +93,10 @@ class SeparateClassMethod(object):
     __slots__ = ("__instance_method", "__class_method")
 
     def __init__(
-        self, imeth=None, cmeth=None
-    ):  # type: (typing.Optional[typing.Callable], typing.Optional[typing.Callable]) -> None
+        self,
+        imeth=None,  # type: typing.Optional[typing.Callable[..., typing.Any]]
+        cmeth=None  # type: typing.Optional[typing.Callable[..., typing.Any]]
+    ):  # type: (...) -> None
         """Separate class method and instance methods.
 
         :param imeth: Instance method
@@ -105,7 +107,11 @@ def __init__(
         self.__instance_method = imeth
         self.__class_method = cmeth
 
-    def __get__(self, instance, owner):  # type: (typing.Optional[typing.Any], typing.Any) -> typing.Callable
+    def __get__(
+        self,
+        instance,  # type: typing.Optional[typing.Any]
+        owner  # type: typing.Any
+    ):  # type: (...) -> typing.Callable[..., typing.Any]
         """Get descriptor.
 
         :return: class method or instance method depends on call behavior
@@ -130,7 +136,10 @@ def instance_method(*args, **kwargs):  # type: (typing.Any, typing.Any) -> typin
 
         return instance_method
 
-    def instance_method(self, imeth):  # type: (typing.Optional[typing.Callable]) -> SeparateClassMethod
+    def instance_method(
+        self,
+        imeth  # type: typing.Optional[typing.Callable[..., typing.Any]]
+    ):  # type: (...) -> SeparateClassMethod
         """Descriptor to change instance method.
 
         :param imeth: New instance method.
@@ -141,7 +150,7 @@ def instance_method(self, imeth):  # type: (typing.Optional[typing.Callable]) ->
         self.__instance_method = imeth
         return self
 
-    def class_method(self, cmeth):  # type: (typing.Optional[typing.Callable]) -> SeparateClassMethod
+    def class_method(self, cmeth):  # type: (typing.Optional[typing.Callable[..., typing.Any]]) -> SeparateClassMethod
         """Descriptor to change class method.
 
         :param cmeth: New class method.
@@ -153,15 +162,15 @@ def class_method(self, cmeth):  # type: (typing.Optional[typing.Callable]) -> Se
         return self
 
     @property
-    def imeth(self):  # type: () -> typing.Optional[typing.Callable]
+    def imeth(self):  # type: () -> typing.Optional[typing.Callable[..., typing.Any]]
         """Instance method instance.
 
         :rtype: typing.Optional[typing.Callable]
         """
         return self.__instance_method
 
     @property
-    def cmeth(self):  # type: () -> typing.Optional[typing.Callable]
+    def cmeth(self):  # type: () -> typing.Optional[typing.Callable[..., typing.Any]]
         """Class method instance.
 
         :rtype: typing.Optional[typing.Callable]

doc/source/conf.py

@@ -13,110 +13,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import ast
-import collections
-import os.path
-import sys
-
-PY3 = sys.version_info[:2] > (2, 7)
-PY34 = sys.version_info[:2] > (3, 3)
-
-with open(
-    os.path.join(
-        os.path.dirname(__file__), '..', '..',
-        'advanced_descriptors', '__init__.py'
-    )
-) as f:
-    source = f.read()
-
-
-# noinspection PyUnresolvedReferences
-def get_simple_vars_from_src(src):
-    """Get simple (string/number/boolean and None) assigned values from source.
-
-    :param src: Source code
-    :type src: str
-    :returns: OrderedDict with keys, values = variable names, values
-    :rtype: typing.Dict[
-                str,
-                typing.Union[
-                    str, bytes,
-                    int, float, complex,
-                    list, set, dict, tuple,
-                    None,
-                ]
-            ]
-
-    Limitations: Only defined from scratch variables.
-    Not supported by design:
-        * Imports
-        * Executable code, including string formatting and comprehensions.
-
-    Examples:
-
-    >>> string_sample = "a = '1'"
-    >>> get_simple_vars_from_src(string_sample)
-    OrderedDict([('a', '1')])
-
-    >>> int_sample = "b = 1"
-    >>> get_simple_vars_from_src(int_sample)
-    OrderedDict([('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])]
-    ... )
-    True
-
-    >>> iterable_sample = "d = ([1], {1: 1}, {1})"
-    >>> get_simple_vars_from_src(iterable_sample)
-    OrderedDict([('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)])
-    """
-    ast_data = (
-        ast.Str, ast.Num,
-        ast.List, ast.Set, ast.Dict, ast.Tuple
-    )
-    if PY3:
-        ast_data += (ast.Bytes,)
-    if PY34:
-        ast_data += (ast.NameConstant,)
-
-    tree = ast.parse(src)
-
-    result = collections.OrderedDict()
-
-    for node in ast.iter_child_nodes(tree):
-        if not isinstance(node, ast.Assign):  # We parse assigns only
-            continue
-        try:
-            if isinstance(node.value, ast_data):
-                value = ast.literal_eval(node.value)
-            elif isinstance(  # NameConstant in python < 3.4
-                node.value, ast.Name
-            ) and isinstance(
-                node.value.ctx, ast.Load  # Read constant
-            ):
-                value = ast.literal_eval(node.value)
-            else:
-                continue
-        except ValueError:
-            continue
-        for tgt in node.targets:
-            if isinstance(
-                tgt, ast.Name
-            ) and isinstance(
-                tgt.ctx, ast.Store
-            ):
-                result[tgt.id] = value
-    return result
-
-
-variables = get_simple_vars_from_src(source)
+import pkg_resources
+
+release = pkg_resources.get_distribution("Advanced-Descriptors").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
@@ -168,9 +68,8 @@ def get_simple_vars_from_src(src):
 # built documents.
 #
 # The short X.Y version.
-version = variables['__version__']
+
 # The full version, including alpha/beta/rc tags.
-release = variables['__version__']
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -119,6 +119,11 @@ def get_simple_vars_from_src(src):
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
@@ -133,22 +138,25 @@ def get_simple_vars_from_src(src):
         "{name} <{email}>".format(name=name, email=email) for name, email in variables["__maintainers__"].items()
     ),
     url=variables["__url__"],
-    version=variables["__version__"],
     license=variables["__license__"],
     description=variables["__description__"],
     long_description=long_description,
     classifiers=classifiers,
     keywords=keywords,
-    python_requires=">=2.7.5,<3.0",
+    python_requires=">=2.7.5,!=3.0,!=3.1,!=3.2,!=3.3",
     # 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
     # situations as progressive releases of projects are done.
     # Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951
     # Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086
-    setup_requires="setuptools >= 21.0.0,!=24.0.0,"
-    "!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,"
-    "!=36.2.0",
+    setup_requires=[
+        "setuptools >= 21.0.0,!=24.0.0,"
+        "!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,"
+        "!=36.2.0",
+        "setuptools_scm",
+    ],
+    use_scm_version=True,
     install_requires=required,
     package_data={"advanced_descriptors": ["py.typed"]},
 )

tox.ini

@@ -5,7 +5,7 @@
 
 [tox]
 minversion = 2.0
-envlist = black, pep8, pylint, mypy, bandit, pep257, py{27,py}, docs,
+envlist = black, pep8, pylint, mypy, bandit, pep257, py{27,py,34,35,36,37,py3}, docs,
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -30,10 +30,6 @@ commands =
 [testenv:venv]
 commands = {posargs:}
 
-[tox:travis]
-2.7 = install, py27
-pypy = install, pypy,
-
 [testenv:pep8]
 deps =
     flake8