Code unification

penguinolog · penguinolog · commit 79eabe707e24 · 2019-10-18T12:23:16.000+02:00
diff --git a/.azure_pipelines/run_tests.yml b/.azure_pipelines/run_tests.yml
@@ -46,7 +46,7 @@ jobs:
   - script: |
       pip install pytest pytest-sugar pytest-cov
 
-      pytest -vvv --junitxml=unit_result.xml --cov=advanced_descriptors --cov-report=xml --cov-report=html --cov-report term test
+      pytest --junitxml=unit_result.xml --cov=advanced_descriptors --cov-report=xml --cov-report=html --cov-report term test
     displayName: PyTest
 
   - task: PublishTestResults@2
diff --git a/.coveragerc b/.coveragerc
@@ -1,8 +1,8 @@
 [run]
 source =
-    advanced_descriptors
+  advanced_descriptors
 omit =
-    test/*
+  test/*
 branch = True
 [report]
 exclude_lines =
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -28,5 +28,5 @@ jobs:
         python setup.py develop -v
     - name: Test with pytest
       run: |
-        py.test -vvv --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
+        py.test --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
         coverage report -m --fail-under 89
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 ### Test results
 /*_result*.xml
 /report.html
+/mypy_report
 /assets/*
 .cache/*
 .pytest_cache/*
@@ -10,7 +11,7 @@
 
 ### Generated code
 /advanced_descriptors/*.c
-/pip-wheel-metadata/
+/pip-wheel-metadata
 ### TortoiseGit template
 # Project-level settings
 /.tgitconfig
diff --git a/.pylintrc b/.pylintrc
@@ -66,12 +66,9 @@ enable=all
 
 disable=non-ascii-bytes-literal,
         raw-checker-failed,
-        bad-inline-option,
         locally-disabled,
         file-ignored,
         suppressed-message,
-        no-absolute-import,
-        eq-without-hash,
         comprehension-escape,
         similarities,
         too-many-ancestors,
@@ -83,6 +80,7 @@ disable=non-ascii-bytes-literal,
         too-many-locals,
         too-many-statements,
         too-many-instance-attributes,
+        too-many-lines,
         misplaced-comparison-constant,
         bad-continuation,
         broad-except,
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ _helpers:
   - &install_cython pip install --upgrade Cython
   - &build_package python setup.py bdist_wheel
   - &install_built pip install advanced_descriptors --no-index -f dist
-  - &test_no_cov  py.test -vv test
+  - &test_no_cov  py.test -vvv test
   - &test_cythonized
     stage: Test cythonized
     install:
@@ -47,7 +47,7 @@ _helpers:
 
 script:
   - python setup.py develop -v
-  - py.test -vvv --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
+  - py.test --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
   - coverage report -m --fail-under 89
 after_success:
   - coveralls
@@ -75,7 +75,7 @@ jobs:
       install:
         - *upgrade_python_toolset
         - *install_deps
-        - pip install --upgrade "mypy >= 0.700"
+        - pip install --upgrade "mypy >= 0.720"
       script:
         - python setup.py --version
         - mypy --strict advanced_descriptors
@@ -93,7 +93,7 @@ jobs:
     #    - *upgrade_python_toolset
     #    - pip install --upgrade pydocstyle
     #    script:
-    #    - pydocstyle advanced_descriptors
+    #    - pydocstyle -v advanced_descriptors
     - <<: *code_style_check
       name: "Black formatting"
       install:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,7 +20,7 @@ jobs:
         displayName: 'Install dependencies'
 
       - script: |
-          pytest -vvv --flake8 -m flake8 --junitxml=flake8_result.xml advanced_descriptors
+          pytest --flake8 -m flake8 --junitxml=flake8_result.xml advanced_descriptors
         displayName: 'PEP8'
 
       - task: PublishTestResults@2
@@ -107,7 +107,6 @@ jobs:
   - template: .azure_pipelines/run_tests.yml
     parameters: {name: 'Python_37', python: '3.7', architecture: 'x86', kind: 'cython'}
 
-
   - job: 'Build_and_deploy'
     dependsOn:
       - Python_36_x64_native
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,9 +2,9 @@
 # Minimum requirements for the build system to execute.
 # PEP 508 specifications for PEP 518.
 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 >= 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",  # PSF/ZPL
   "wheel",
-  "setuptools_scm"
+  "setuptools_scm",
 ]
 build-backend="setuptools.build_meta"
 
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,4 @@
 [pytest]
 addopts = -vvv -s -p no:django -p no:ipdb
 testpaths = test
+mock_use_standalone_module = false
diff --git a/setup.cfg b/setup.cfg
@@ -4,6 +4,8 @@ project_urls =
   Bug Tracker = https://github.com/python-useful-helpers/advanced-descriptors/issues
   Documentation = https://advanced-descriptors.readthedocs.io/
 
+long_description = file: README.rst
+
 [options]
 zip_safe = False
 packages = find:
@@ -37,6 +39,8 @@ exclude =
 ignore =
   E203,
 # whitespace before ':'
+  W503,
+# line break before binary operator
   D401,
 # First line should be in imperative mood; try rephrasing
   D202,
diff --git a/setup.py b/setup.py
@@ -15,7 +15,6 @@
 
 # Standard Library
 import ast
-import collections
 import distutils.errors
 import os.path
 import shutil
@@ -127,7 +126,7 @@ def build_extension(self, ext):
 # noinspection PyUnresolvedReferences
 def get_simple_vars_from_src(
     src: str
-) -> "typing.Dict[str, typing.Union[str, bytes, int, float, complex, list, set, dict, tuple, None]]":
+) -> "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
@@ -139,7 +138,7 @@ def get_simple_vars_from_src(
                     str, bytes,
                     int, float, complex,
                     list, set, dict, tuple,
-                    None,
+                    None, bool, Ellipsis
                 ]
             ]
 
@@ -152,32 +151,33 @@ def get_simple_vars_from_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}
     """
-    ast_data = (ast.Str, ast.Num, ast.List, ast.Set, ast.Dict, ast.Tuple, ast.Bytes, ast.NameConstant)
+    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)
+    else:
+        ast_data = ast.Constant
 
     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
diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 minversion = 2.0
-envlist = black, pep8, pylint, mypy, bandit, pep257, py{36,37}, py{36,37}-nocov, docs,
+envlist = black, pep8, pylint, mypy, bandit, pep257, py{36,37}, docs, py{36,37}-nocov
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -26,26 +26,26 @@ deps =
 commands =
   pip freeze
   python setup.py develop -v
-  py.test -vvv --junitxml=unit_result.xml --html=report.html --self-contained-html --cov-config .coveragerc --cov-report html --cov=advanced_descriptors {posargs:test}
+  py.test --junitxml=unit_result.xml --cov-report html --self-contained-html --html=report.html --cov-config .coveragerc --cov=advanced_descriptors {posargs:test}
   coverage report --fail-under 89
 
 [testenv:py36-nocov]
 commands =
   python setup.py bdist_wheel
   pip install advanced_descriptors --no-index -f dist
-  py.test -vv {posargs:test}
+  py.test {posargs:test}
 
 [testenv:py37-nocov]
 commands =
   python setup.py bdist_wheel
   pip install advanced_descriptors --no-index -f dist
-  py.test -vv {posargs:test}
+  py.test {posargs:test}
 
 [testenv:py38-nocov]
 commands =
   python setup.py bdist_wheel
   pip install advanced_descriptors --no-index -f dist
-  py.test -vv {posargs:test}
+  py.test {posargs:test}
 
 [testenv:venv]
 commands = {posargs:}
@@ -59,7 +59,7 @@ commands = flake8
 [testenv:pep257]
 deps =
   pydocstyle
-commands = pydocstyle advanced_descriptors
+commands = pydocstyle -v advanced_descriptors
 
 [testenv:doc8]
 deps =
@@ -73,7 +73,7 @@ commands = pip install ./ -vvv -U
 
 [testenv:pylint]
 deps =
-  pylint>2.3
+  pylint>=2.3
   isort[pyproject,requirements]
   -r{toxinidir}/CI_REQUIREMENTS.txt
 commands =
@@ -108,11 +108,12 @@ commands =
 
 [testenv:mypy]
 deps =
-  mypy>=0.700
+  mypy>=0.720
+  lxml
   -r{toxinidir}/CI_REQUIREMENTS.txt
 commands =
   python setup.py --version
-  mypy --strict advanced_descriptors
+  mypy --strict --xslt-html-report mypy_report -p advanced_descriptors
 
 [testenv:isort]
 deps =
