Unify deployment code with logwrap

Author: penguinolog

.azure_pipelines/run_tests.yml

@@ -26,7 +26,7 @@ jobs:
 
   - script: |
       python -m pip install --upgrade pip
-      pip install -U setuptools
+      pip install -U setuptools virtualenv wheel
     displayName: upgrade pip and setuptools
 
   - script: |
@@ -44,7 +44,7 @@ jobs:
     displayName: Build and install
 
   - script: |
-      pip install pytest pytest-sugar pytest-cov
+      pip install pytest pytest-sugar pytest-cov coverage[toml]>=5.0
 
       pytest --junitxml=unit_result.xml --cov=advanced_descriptors --cov-report=xml --cov-report=html --cov-report term test
     displayName: PyTest
@@ -62,4 +62,3 @@ jobs:
       inputs:
         codeCoverageTool: Cobertura
         summaryFileLocation: ${{ format('$(System.DefaultWorkingDirectory)/coverage.xml') }}
-        reportDirectory: ${{ format('$(System.DefaultWorkingDirectory)/htmlcov') }}

.coveragerc

@@ -10,7 +10,7 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [3.6, 3.7]
+        python-version: [3.6, 3.7, 3.8]
 
     steps:
     - uses: actions/checkout@v1
@@ -22,11 +22,11 @@ jobs:
       run: |
         python -m pip install --upgrade pip wheel
         pip install -r CI_REQUIREMENTS.txt
-        pip install --upgrade pytest pytest-sugar pytest-cov
+        pip install --upgrade pytest pytest-sugar pytest-cov coverage[toml]>=5.0
     - name: Build package and install develop
       run: |
         python setup.py develop -v
     - name: Test with pytest
       run: |
-        py.test --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
+        py.test --cov-report= --cov=advanced_descriptors test
         coverage report -m --fail-under 89

.github/workflows/pythonpackage.yml

@@ -0,0 +1,11 @@
+[pydocstyle]
+ignore =
+  D401,
+# First line should be in imperative mood; try rephrasing
+  D202,
+# No blank lines allowed after function docstring
+  D203,
+# 1 blank line required before class docstring
+  D213
+# Multi-line docstring summary should start at the second line
+match = (?!_version|test_)*.py

.pydocstyle.ini

@@ -1,11 +1,10 @@
 language: python
 os: linux
-dist: xenial
-sudo: true
+dist: bionic
 
 install:
   - &upgrade_python_toolset pip install --upgrade pip setuptools wheel
-  - &install_test_deps pip install --upgrade pytest pytest-sugar
+  - &install_test_deps pip install --upgrade pytest pytest-sugar coverage[toml]>=5.0
   - &install_deps pip install -r CI_REQUIREMENTS.txt
   - pip install --upgrade pytest-cov coveralls
 
@@ -16,6 +15,9 @@ _python:
   - &python37
     name: "Python 3.7"
     python: "3.7"
+  - &python38
+    name: "Python 3.8"
+    python: "3.8"
 
 _helpers:
   - &install_cython pip install --upgrade Cython
@@ -33,24 +35,45 @@ _helpers:
       - *build_package
       - *install_built
       - *test_no_cov
-    after_success: skip
 
   - &static_analysis
     stage: Static analysis
     <<: *python37
-    after_success: skip
 
   - &code_style_check
     stage: Code style check
     <<: *python37
-    after_success: skip
+
+  - &deploy
+    <<: *python37
+    if: tag IS present
+    services:
+    - docker
+    install:
+      - *upgrade_python_toolset
+      - *install_deps
+      - pip install -U --upgrade-strategy=eager --no-cache-dir twine
+    before_deploy:
+      - *build_package
+    deploy:
+      - provider: pypi
+        # `skip_cleanup: true` is required to preserve binary wheels, built
+        # inside of manylinux* docker container during `script` step above.
+        cleanup: false
+        skip_cleanup: true
+        username: penguinolog
+        password:
+          secure: mG8p4UUzpz9wBdbif68NunjLp3rSED/OJw2Rh1nLBSSNcKtRBVEW4Gm/KYfHHc+kXVB66Nkda+T214kx4WhDk7lVRDKVu7ej0ze2mJX9iYmxhjOt7dcldostPAT8ZFfIvxEpS3UYGCPRbWTdOeeTe3wqz7/boVjC4DZu82nTarBJzApEn5ivtVHMs9bCedmk9Potb3FOiOscjkmEiKSllVQhgHnE/WPBOkfsaSaTCQKeTnqcCqJehNo4ki0cbmtAMpdPoR4DxAlHFK9jFD/W5Pm8s3UMkCer7vTwImINYICuibAIKEKcHdSHXOWJ6FoT21mJdgTWoZQGlAAKw8KV9R8dM6bNazV9iJbM3qUTUEJzyb08miRUf6iKxoPR1MpfqxuZ+ExGHfb0gX/Nu75aNxCSTbQ1YJD/oeXaqRQwpeGmW8vAXB9JSThfiEafymWMOKYuvgg0GPIP2RlLw7+zacfw9915VFiLpKSPrD48YU3p9jamIUeYb2aEDHpQK3rH4JUeAjdWV+a0mi0xWLjFzrVFc3R3jyUPAoxLNHLxzmb8+55pevA1JPUEYY2dolGBnZ7eXBAOIkHgEFlqqRxp4TLXoQR98eESYwrvaSV2YA11IuAJHF4bBI1pUfuUO7KiIDhacVi8VfNu5lAw8M1tInZk4aYLK6sw8L7XKq5hfZs=
+        on:
+          tags: true
+        distributions: sdist
+        upload_docs: false
+        skip_existing: true
 
 script:
   - python setup.py develop -v
-  - py.test --cov-config .coveragerc --cov-report= --cov=advanced_descriptors test
+  - py.test --cov-report= --cov=advanced_descriptors test
   - coverage report -m --fail-under 89
-after_success:
-  - coveralls
 
 jobs:
   include:
@@ -98,48 +121,58 @@ jobs:
       name: "Black formatting"
       install:
         - *upgrade_python_toolset
-        - pip install --upgrade black
+        - pip install --upgrade black regex
       script:
         - black --check advanced_descriptors
 
     - stage: test
       <<: *python36
+      after_success:
+        - coveralls
     - stage: test
       <<: *python37
+      after_success:
+        - coveralls
+    - stage: test
+      <<: *python38
+      after_success:
+        - coveralls
 
     - <<: *test_cythonized
       <<: *python36
     - <<: *test_cythonized
       <<: *python37
+    - <<: *test_cythonized
+      <<: *python38
 
     - stage: deploy
       # This prevents job from appearing in test plan unless commit is tagged:
-      if: tag IS present
-      # Run on pypy to build not cythonized wheel
-      <<: *python37
+      <<: *deploy
       name: Build universal and cythonized bdist_wheel. Deploy bdist and sdist.
-      services:
-        - docker
-      install:
-        - *upgrade_python_toolset
-        - *install_deps
       script:
-        - ./tools/run_docker.sh "advanced_descriptors"
-      before_deploy:
-        - *build_package
-      deploy:
-        - provider: pypi
-          # `skip_cleanup: true` is required to preserve binary wheels, built
-          # inside of manylinux1 docker container during `script` step above.
-          skip_cleanup: true
-          user: penguinolog
-          password:
-            secure: "mG8p4UUzpz9wBdbif68NunjLp3rSED/OJw2Rh1nLBSSNcKtRBVEW4Gm/KYfHHc+kXVB66Nkda+T214kx4WhDk7lVRDKVu7ej0ze2mJX9iYmxhjOt7dcldostPAT8ZFfIvxEpS3UYGCPRbWTdOeeTe3wqz7/boVjC4DZu82nTarBJzApEn5ivtVHMs9bCedmk9Potb3FOiOscjkmEiKSllVQhgHnE/WPBOkfsaSaTCQKeTnqcCqJehNo4ki0cbmtAMpdPoR4DxAlHFK9jFD/W5Pm8s3UMkCer7vTwImINYICuibAIKEKcHdSHXOWJ6FoT21mJdgTWoZQGlAAKw8KV9R8dM6bNazV9iJbM3qUTUEJzyb08miRUf6iKxoPR1MpfqxuZ+ExGHfb0gX/Nu75aNxCSTbQ1YJD/oeXaqRQwpeGmW8vAXB9JSThfiEafymWMOKYuvgg0GPIP2RlLw7+zacfw9915VFiLpKSPrD48YU3p9jamIUeYb2aEDHpQK3rH4JUeAjdWV+a0mi0xWLjFzrVFc3R3jyUPAoxLNHLxzmb8+55pevA1JPUEYY2dolGBnZ7eXBAOIkHgEFlqqRxp4TLXoQR98eESYwrvaSV2YA11IuAJHF4bBI1pUfuUO7KiIDhacVi8VfNu5lAw8M1tInZk4aYLK6sw8L7XKq5hfZs="
-          on:
-            tags: true
-            distributions: sdist
-          skip_upload_docs: true
-          skip_existing: true
+        - ./tools/run_docker.sh advanced_descriptors
+
+    - stage: deploy
+      # This prevents job from appearing in test plan unless commit is tagged:
+      <<: *deploy
+      name: Build universal and cythonized for i686 bdist_wheel. Deploy bdist.
+      script:
+        - ./tools/run_docker_manylinux2014.sh advanced_descriptors "i686"
+
+    - stage: deploy
+      # This prevents job from appearing in test plan unless commit is tagged:
+      <<: *deploy
+      name: Build universal and cythonized for x86_64 bdist_wheel. Deploy bdist.
+      script:
+        - ./tools/run_docker_manylinux2014.sh advanced_descriptors "x86_64"
+
+    - stage: deploy
+      # This prevents job from appearing in test plan unless commit is tagged:
+      <<: *deploy
+      name: Build universal and cythonized for aarch64 bdist_wheel. Deploy bdist.
+      arch: arm64
+      script:
+        - ./tools/run_docker_manylinux2014.sh advanced_descriptors "aarch64"
 
 cache: pip
 before_cache:

.travis.yml

@@ -14,7 +14,7 @@ jobs:
 
       - script: |
           python -m pip install --upgrade pip
-          pip install -U setuptools
+          pip install -U setuptools virtualenv
           pip install -r requirements.txt
           pip install -U pytest pytest-sugar pytest-flake8 flake8-bugbear flake8-docstrings
         displayName: 'Install dependencies'
@@ -41,7 +41,7 @@ jobs:
 
       - script: |
           python -m pip install --upgrade pip
-          pip install -U setuptools
+          pip install -U setuptools virtualenv
           pip install -r requirements.txt
           pip install -U pytest pylint pylint_junit isort[pyproject,requirements]
         displayName: 'Install dependencies'
@@ -74,7 +74,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -U setuptools
           pip install -r requirements.txt
-          pip install -U "mypy>=0.700"
+          pip install -U "mypy>=0.720"
         displayName: 'Install dependencies'
 
       - script: |
@@ -97,6 +97,8 @@ jobs:
     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_38', python: '3.8', architecture: 'x64', kind: 'native'}
 
   - template: .azure_pipelines/run_tests.yml
     parameters: {name: 'Python_36', python: '3.6', architecture: 'x64', kind: 'cython'}
@@ -106,16 +108,23 @@ jobs:
     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'}
+  - template: .azure_pipelines/run_tests.yml
+    parameters: {name: 'Python_38', python: '3.8', architecture: 'x64', kind: 'cython'}
+  - template: .azure_pipelines/run_tests.yml
+    parameters: {name: 'Python_38', python: '3.8', architecture: 'x86', kind: 'cython'}
 
   - job: 'Build_and_deploy'
     dependsOn:
       - Python_36_x64_native
       - Python_37_x64_native
+      - Python_38_x64_native
 
       - Python_36_x64_cython
       - Python_36_x86_cython
       - Python_37_x64_cython
       - Python_37_x86_cython
+      - Python_38_x64_cython
+      - Python_38_x86_cython
     condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
     pool:
       vmIMage: 'VS2017-Win2016'
@@ -134,6 +143,12 @@ jobs:
         Python37_x86:
           python.version: '3.7'
           python.architecture: 'x86'
+        Python38_x64:
+          python.version: '3.8'
+          python.architecture: 'x64'
+        Python38_x86:
+          python.version: '3.8'
+          python.architecture: 'x86'
 
     steps:
       - task: UsePythonVersion@0
@@ -145,6 +160,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -U setuptools
           pip install -r build_requirements.txt
+          pip install -U --upgrade-strategy=eager wheel
         displayName: 'Install dependencies'
 
       - script: |

azure-pipelines.yml

@@ -1,3 +1,2 @@
 Cython; platform_python_implementation == "CPython"
-wheel==0.31.1
 -r CI_REQUIREMENTS.txt

build_requirements.txt

@@ -20,5 +20,46 @@ force_single_line = true
 
 import_heading_stdlib = "Standard Library"
 import_heading_thirdparty = "External Dependencies"
-import_heading_firstparty = "Advanced Descriptors Implementation"
+import_heading_firstparty = "Package Implementation"
 import_heading_localfolder = "Local Implementation"
+
+[tool.coverage.run]
+omit = ["test/*"]
+branch = true
+
+[tool.coverage.report]
+exclude_lines = [
+  # Have to re-enable the standard pragma
+  "pragma: no cover",
+
+  # Don't complain about missing debug-only code:
+  "def __repr__",
+
+  # Don't complain if tests don't hit defensive assertion code:
+  "raise NotImplementedError",
+
+  # Exclude methods marked as abstract
+  "@abstractmethod",
+
+  # Exclude import statements
+  "^from\b",
+  "^import\b",
+
+  # Exclude variable declarations that are executed when file is loaded
+  "^[a-zA-Z_]+\b\\s=",
+
+  # Code for static analysis is never covered:
+  "if typing.TYPE_CHECKING:",
+
+  # Fallback code with no installed deps is almost impossible to cover properly
+  "except ImportError:",
+
+  # Don't complain if non-runnable code isn't run:
+  "if __name__ == .__main__.:",
+
+  # OS Specific
+  "if platform.system()",
+]
+
+[tool.coverage.json]
+pretty_print = true

pyproject.toml

@@ -2,3 +2,4 @@
 addopts = -vvv -s -p no:django -p no:ipdb
 testpaths = test
 mock_use_standalone_module = false
+junit_family = xunit2