Merge 9a2d2cc into b131000

python-useful-helpers · Nov 21, 2018 · 55e42ac · 55e42ac
2 parents b131000 + 9a2d2cc
commit 55e42ac
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 111 deletions.
diff --git a/.azure_pipelines/run_tests.yml b/.azure_pipelines/run_tests.yml
@@ -0,0 +1,56 @@
+parameters:
+  name: ""
+  python: ""
+  architecture: "x64"
+  kind: "native"
+
+jobs:
+- job: ${{ format('{0}_{1}_{2}', parameters.name, parameters.architecture, parameters.kind) }}
+  dependsOn: PyLint
+  pool:
+    vmImage: "vs2017-win2016"
+
+  steps:
+  # ensure the required Python versions are available
+  - task: UsePythonVersion@0
+    displayName: setup python
+    inputs:
+      versionSpec: ${{ parameters.python }}
+      architecture: ${{ parameters.architecture }}
+
+  - script: "python -c \"import sys; print(sys.version); print(sys.executable)\""
+    displayName: show python information
+
+  - script: |
+      python -m pip install --upgrade pip
+      pip install -U setuptools
+    displayName: upgrade pip and setuptools
+
+  - script: |
+      pip install -r requirements.txt
+    displayName: Install dependencies
+
+  - ${{ if eq(parameters.kind, 'cython') }}:
+    - script: |
+        pip install -r build_requirements.txt
+      displayName: Install build requirements
+
+  - script: |
+      pip install -U wheel
+      python setup.py bdist_wheel
+      pip install --pre --no-index -f dist advanced-descriptors
+    displayName: Build and install
+
+  - script: |
+      pip install pytest pytest-sugar
+
+      pytest -vvv --junitxml=unit_result.xml test
+    displayName: PyTest
+
+  - task: PublishTestResults@2
+    displayName: publish test results via junit
+    condition: succeededOrFailed()
+    inputs:
+      testResultsFormat: "JUnit"
+      testResultsFiles: ${{ format('$(System.DefaultWorkingDirectory)/unit_result.xml') }}
+      testRunTitle: ${{ format('{0}_{1}_{2}', parameters.name, parameters.architecture, parameters.kind) }}
diff --git a/advanced_descriptors/__init__.py b/advanced_descriptors/__init__.py
@@ -13,13 +13,25 @@
 
 """Advanced descriptors for special cases."""
 
+import pkg_resources
+
 from .separate_class_method import SeparateClassMethod
 from .advanced_property import AdvancedProperty
 from .log_on_access import LogOnAccess
 
 __all__ = ("SeparateClassMethod", "AdvancedProperty", "LogOnAccess")
 
-__version__ = "2.2.1"
+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
+
 __author__ = "Alexey Stepanov"
 __author_email__ = "penguinolog@gmail.com"
 __maintainers__ = {

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -24,3 +24,29 @@ jobs:
       pip install -U pylint
       pylint -f msvs advanced_descriptors
     displayName: 'PyLint'
+
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_34', python: '3.4', architecture: 'x64', kind: 'native'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_35', python: '3.5', architecture: 'x64', kind: 'native'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_36', python: '3.6', architecture: 'x64', kind: 'native'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_37', python: '3.7', architecture: 'x64', kind: 'native'}
+
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_34', python: '3.4', architecture: 'x64', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_34', python: '3.4', architecture: 'x86', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_35', python: '3.5', architecture: 'x64', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_35', python: '3.5', architecture: 'x86', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_36', python: '3.6', architecture: 'x64', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_36', python: '3.6', architecture: 'x86', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_37', python: '3.7', architecture: 'x64', kind: 'cython'}
+- template: .azure_pipelines/run_tests.yml
+  parameters: {name: 'Python_37', python: '3.7', architecture: 'x86', kind: 'cython'}
diff --git a/doc/source/conf.py b/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("logwrap").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.

diff --git a/setup.py b/setup.py
@@ -216,7 +216,6 @@ 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,
@@ -229,9 +228,13 @@ def get_simple_vars_from_src(src):
     # 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"]},
 )