Code unification & restore windows build

penguinolog · penguinolog · commit 52d5a7a02afc · 2019-10-18T12:28:33.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=threaded --cov-report=xml --cov-report=html --cov-report term test
+      pytest --junitxml=unit_result.xml --cov=threaded --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 =
-    threaded
+  threaded
 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=threaded test
+        py.test --cov-config .coveragerc --cov-report= --cov=threaded test
         coverage report -m --fail-under 90
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
 /threaded/*.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,
-        old-division,
         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 threaded --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 -vv --cov-config .coveragerc --cov-report= --cov=threaded test
+  - py.test --cov-config .coveragerc --cov-report= --cov=threaded test
   - coverage report -m --fail-under 87
 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 threaded
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 threaded
+          pytest --flake8 -m flake8 --junitxml=flake8_result.xml threaded
         displayName: 'PEP8'
 
       - task: PublishTestResults@2
@@ -74,7 +74,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -U setuptools
           pip install -r requirements.txt
-          pip install -U mypy
+          pip install -U "mypy>=0.700"
         displayName: 'Install dependencies'
 
       - script: |
@@ -98,66 +98,66 @@ jobs:
   - 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_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'}
-
-
-#  - job: 'Build_and_deploy'
-#    dependsOn:
-#      - Python_36_x64_native
-#      - Python_37_x64_native
-#
-##      - Python_36_x64_cython
-##      - Python_36_x86_cython
-##      - Python_37_x64_cython
-##      - Python_37_x86_cython
-#    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
-#    pool:
-#      vmIMage: 'VS2017-Win2016'
-#    strategy:
-#      maxParallel: 6
-#      matrix:
-#        Python36_x64:
-#          python.version: '3.6'
-#          python.architecture: 'x64'
-#        Python36_x86:
-#          python.version: '3.6'
-#          python.architecture: 'x86'
-#        Python37_x64:
-#          python.version: '3.7'
-#          python.architecture: 'x64'
-#        Python37_x86:
-#          python.version: '3.7'
-#          python.architecture: 'x86'
-#
-#    steps:
-#      - task: UsePythonVersion@0
-#        inputs:
-#          versionSpec: '$(python.version)'
-#          architecture: '$(python.architecture)'
-#
-#      - script: |
-#          python -m pip install --upgrade pip
-#          pip install -U setuptools
-#          pip install -r build_requirements.txt
-#        displayName: 'Install dependencies'
-#
-#      - script: |
-#          python setup.py bdist_wheel
-#        displayName: 'Build'
-#
-#      - task: TwineAuthenticate@0
-#        displayName: 'Twine Authenticate '
-#        inputs:
-#          externalFeeds: PyPI
-#
-#      - script: |
-#          pip install -U twine
-#          twine upload -r PyPI --config-file $(PYPIRC_PATH) dist/threaded-* --skip-existing
-#        displayName: 'Deploy'
+  - 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'}
+
+
+  - job: 'Build_and_deploy'
+    dependsOn:
+      - Python_36_x64_native
+      - Python_37_x64_native
+
+      - Python_36_x64_cython
+      - Python_36_x86_cython
+      - Python_37_x64_cython
+      - Python_37_x86_cython
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+    pool:
+      vmIMage: 'VS2017-Win2016'
+    strategy:
+      maxParallel: 6
+      matrix:
+        Python36_x64:
+          python.version: '3.6'
+          python.architecture: 'x64'
+        Python36_x86:
+          python.version: '3.6'
+          python.architecture: 'x86'
+        Python37_x64:
+          python.version: '3.7'
+          python.architecture: 'x64'
+        Python37_x86:
+          python.version: '3.7'
+          python.architecture: 'x86'
+
+    steps:
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '$(python.version)'
+          architecture: '$(python.architecture)'
+
+      - script: |
+          python -m pip install --upgrade pip
+          pip install -U setuptools
+          pip install -r build_requirements.txt
+        displayName: 'Install dependencies'
+
+      - script: |
+          python setup.py bdist_wheel
+        displayName: 'Build'
+
+      - task: TwineAuthenticate@0
+        displayName: 'Twine Authenticate '
+        inputs:
+          externalFeeds: PyPI
+
+      - script: |
+          pip install -U twine
+          twine upload -r PyPI --config-file $(PYPIRC_PATH) dist/threaded-* --skip-existing
+        displayName: 'Deploy'
diff --git a/build_requirements.txt b/build_requirements.txt
@@ -1,4 +1,4 @@
 Cython; platform_python_implementation == "CPython"
-wheel<0.32.0
+wheel==0.31.1
 -r CI_REQUIREMENTS.txt
 -r requirements.txt
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/threaded/issues
   Documentation = https://threaded.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
@@ -16,7 +16,6 @@
 
 # Standard Library
 import ast
-import collections
 import distutils.errors
 import os.path
 import shutil
@@ -38,7 +37,6 @@
 except ImportError:
     cythonize = None
 
-
 PACKAGE_NAME = "threaded"
 
 with open(os.path.join(os.path.dirname(__file__), PACKAGE_NAME, "__init__.py")) as f:
@@ -52,15 +50,19 @@
 
 
 # noinspection PyCallingNonCallable
-if cythonize is not None and "win32" != sys.platform:
+if cythonize is not None:
     REQUIRES_OPTIMIZATION = [
         setuptools.Extension("threaded.class_decorator", ["threaded/class_decorator.pyx"]),
         setuptools.Extension("threaded._base_threaded", ["threaded/_base_threaded.py"]),
         setuptools.Extension("threaded._asynciotask", ["threaded/_asynciotask.pyx"]),
         setuptools.Extension("threaded._threaded", ["threaded/_threaded.pyx"]),
         setuptools.Extension("threaded._threadpooled", ["threaded/_threadpooled.py"]),
-        setuptools.Extension("threaded.__init__", ["threaded/__init__.pyx"]),
+
     ]
+    if "win32" != sys.platform:
+        # NOTE: Do not make pyx/pxd - it kills windows
+        REQUIRES_OPTIMIZATION.append(setuptools.Extension("threaded.__init__", ["threaded/__init__.py"]),)
+
     INTERFACES = ["class_decorator.pxd", "_asynciotask.pxd", "_threaded.pxd"]
 
     EXT_MODULES = cythonize(
@@ -104,7 +106,7 @@ def run(self):
                 shutil.copyfile(src, dst)
         except (
             distutils.errors.DistutilsPlatformError,
-            getattr(globals()["__builtins__"], "FileNotFoundError", OSError),
+            FileNotFoundError,
         ):
             raise BuildFailed()
 
@@ -127,7 +129,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 +141,7 @@ def get_simple_vars_from_src(
                     str, bytes,
                     int, float, complex,
                     list, set, dict, tuple,
-                    None,
+                    None, bool, Ellipsis
                 ]
             ]
 
@@ -152,32 +154,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/threaded/__init__.pxd b/threaded/__init__.pxd
@@ -1,9 +0,0 @@
-cpdef tuple __all__
-
-cpdef str __version__
-cpdef str __author__
-cpdef str __author_email__
-cpdef dict __maintainers__
-cpdef str __url__
-cpdef str __description__
-cpdef str __license__
diff --git a/threaded/__init__.pyx b/threaded/__init__.pyx
diff --git a/tox.ini b/tox.ini
