From 081969ae32ea7f38b14d4d5ef47a68c158b60095 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 21:09:41 +0000 Subject: [PATCH] Updated files with 'repo_helper'. --- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 8 ++++---- .github/workflows/python_ci_macos.yml | 4 ++-- .isort.cfg | 2 ++ .pre-commit-config.yaml | 5 +++++ .pylintrc | 2 +- tox.ini | 2 +- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 6be64e3..a15d210 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: ['windows-2019', 'macos-latest', 'ubuntu-20.04'] fail-fast: false steps: diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 34fe25c..bd53f38 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.4' strategy: fail-fast: False @@ -23,7 +23,7 @@ jobs: - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {python-version: "3.8", testenvs: "py38,build", experimental: False} - {python-version: "3.9", testenvs: "py39,build", experimental: False} - - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True} + - {python-version: "3.10.0-alpha.4", testenvs: "py310-dev,build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index c2bf5c8..d0e48e2 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -13,7 +13,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,3.10.0-alpha.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,3.10.0-alpha.4' strategy: fail-fast: False @@ -24,7 +24,7 @@ jobs: - {python-version: "3.8", testenvs: "py38,build", experimental: False} - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False} - - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True} + - {python-version: "3.10.0-alpha.4", testenvs: "py310-dev,build", experimental: True} steps: - name: Checkout 🛎️ @@ -69,7 +69,7 @@ jobs: - name: Install dependencies 🔧 run: | python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade coveralls coverage_pyver_pragma + python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma - name: "Download Coverage 🪂" uses: actions/download-artifact@v2 @@ -95,7 +95,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - coveralls + coveralls --service=github Deploy: needs: tests diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index a091f00..0f24b08 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -13,7 +13,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,3.10.0-alpha.3' + USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,3.10.0-alpha.4' strategy: fail-fast: False @@ -24,7 +24,7 @@ jobs: - {python-version: "3.8", testenvs: "py38,build", experimental: False} - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False} - - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True} + - {python-version: "3.10.0-alpha.4", testenvs: "py310-dev,build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.isort.cfg b/.isort.cfg index 62d376c..063d356 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -14,6 +14,8 @@ remove_redundant_aliases = True default_section = THIRDPARTY known_third_party = betamax + click + consolekit covdefaults coverage coverage_pyver_pragma diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 50731d9..6bc1061 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,6 +40,11 @@ repos: - id: ensure-dunder-all files: ^pre_commit_hooks/.*\.py$ + - repo: https://github.com/domdfcoding/flake2lint + rev: v0.2.0 + hooks: + - id: flake2lint + - repo: https://github.com/pre-commit/pygrep-hooks rev: v1.7.0 hooks: diff --git a/.pylintrc b/.pylintrc index cfee0f1..12063c9 100644 --- a/.pylintrc +++ b/.pylintrc @@ -66,7 +66,7 @@ confidence= # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" disable=all -enable=assert-on-tuple,astroid-error,bad-except-order,bad-inline-option,bad-option-value,bad-reversed-sequence,bare-except,binary-op-exception,boolean-datetime,catching-non-exception,cell-var-from-loop,confusing-with-statement,consider-merging-isinstance,consider-using-enumerate,consider-using-ternary,continue-in-finally,cyclic-import,deprecated-pragma,django-not-available,duplicate-except,duplicate-key,eval-used,exec-used,expression-not-assigned,fatal,file-ignored,fixme,global-at-module-level,global-statement,global-variable-not-assigned,global-variable-undefined,http-response-with-content-type-json,http-response-with-json-dumps,invalid-all-object,invalid-characters-in-docstring,len-as-condition,literal-comparison,locally-disabled,locally-enabled,lost-exception,lowercase-l-suffix,misplaced-bare-raise,missing-kwoa,mixed-line-endings,model-has-unicode,model-missing-unicode,model-no-explicit-unicode,model-unicode-not-callable,multiple-imports,multiple-statements,new-db-field-with-default,non-ascii-bytes-literals,nonexistent-operator,not-an-iterable,not-in-loop,notimplemented-raised,overlapping-except,parse-error,pointless-statement,pointless-string-statement,raising-bad-type,raising-non-exception,raw-checker-failed,redefine-in-handler,redefined-argument-from-local,redefined-builtin,redundant-content-type-for-json-response,reimported,relative-import,return-outside-function,simplifiable-if-statement,singleton-comparison,syntax-error,trailing-comma-tuple,trailing-newlines,unbalanced-tuple-unpacking,undefined-all-variable,undefined-loop-variable,unexpected-line-ending-format,unidiomatic-typecheck,unnecessary-lambda,unnecessary-pass,unnecessary-semicolon,unneeded-not,unpacking-non-sequence,unreachable,unrecognized-inline-option,used-before-assignment,useless-else-on-loop,using-constant-test,wildcard-import,yield-outside-function,useless-return +enable=assert-on-tuple,astroid-error,bad-except-order,bad-inline-option,bad-option-value,bad-reversed-sequence,bare-except,binary-op-exception,boolean-datetime,catching-non-exception,cell-var-from-loop,confusing-with-statement,consider-merging-isinstance,consider-using-enumerate,consider-using-ternary,continue-in-finally,cyclic-import,deprecated-pragma,django-not-available,duplicate-except,duplicate-key,eval-used,exec-used,expression-not-assigned,fatal,file-ignored,fixme,global-at-module-level,global-statement,global-variable-not-assigned,global-variable-undefined,http-response-with-content-type-json,http-response-with-json-dumps,invalid-all-object,invalid-characters-in-docstring,len-as-condition,literal-comparison,locally-disabled,locally-enabled,lost-exception,lowercase-l-suffix,misplaced-bare-raise,missing-kwoa,mixed-line-endings,model-has-unicode,model-missing-unicode,model-no-explicit-unicode,model-unicode-not-callable,multiple-imports,multiple-statements,new-db-field-with-default,non-ascii-bytes-literals,nonexistent-operator,not-in-loop,notimplemented-raised,overlapping-except,parse-error,pointless-statement,pointless-string-statement,raising-bad-type,raising-non-exception,raw-checker-failed,redefine-in-handler,redefined-argument-from-local,redefined-builtin,redundant-content-type-for-json-response,reimported,relative-import,return-outside-function,simplifiable-if-statement,singleton-comparison,syntax-error,trailing-comma-tuple,trailing-newlines,unbalanced-tuple-unpacking,undefined-all-variable,undefined-loop-variable,unexpected-line-ending-format,unidiomatic-typecheck,unnecessary-lambda,unnecessary-pass,unnecessary-semicolon,unneeded-not,unpacking-non-sequence,unreachable,unrecognized-inline-option,used-before-assignment,useless-else-on-loop,using-constant-test,wildcard-import,yield-outside-function,useless-return [REPORTS] diff --git a/tox.ini b/tox.ini index bdf4e04..eae0361 100644 --- a/tox.ini +++ b/tox.ini @@ -77,7 +77,6 @@ ignore_errors = True changedir = {toxinidir} deps = mypy==0.790 - lxml -r{toxinidir}/tests/requirements.txt commands = mypy pre_commit_hooks tests {posargs} @@ -132,6 +131,7 @@ exclude_lines = if TYPE_CHECKING: if typing.TYPE_CHECKING: if __name__ == .__main__.: + \.\.\. [check-wheel-contents] ignore = W002