Skip to content

Normalize message to enable support for mypy 0.902 and pytest 6.2.4 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
max-parallel: 4
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9]

steps:
- uses: actions/checkout@v1
Expand All @@ -22,8 +22,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -c requirements.txt invoke tox
- name: Run tox for pytest 5.3.x
python -m pip install -c constraints.txt invoke tox
- name: Run tox
env:
TOX_PARALLEL_NO_SPINNER: "1"
run: |
Expand All @@ -45,7 +45,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install -c requirements.txt flake8 flake8-isort black mypy
python -m pip install -c constraints.txt flake8 flake8-isort black mypy
pip list
- name: Run black
run: |
Expand All @@ -55,7 +55,7 @@ jobs:
mypy src tests
- name: Run isort
run: |
isort --diff --verbose
isort . --check --diff
- name: Run flake8
run: |
flake8 --help
Expand Down
3 changes: 1 addition & 2 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ multi_line_output = 3
include_trailing_comma = true
order_by_type = true
skip = .eggs,.git,.tox,build,dist,docs
skip_gitignore = true
lines_after_imports = 2
known_standard_library = contextvars,dataclasses
known_third_party = _pytest,invoke,mypy,py,pytest
known_first_party = pytest_mypy_testing
sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
63 changes: 63 additions & 0 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#
# This file is autogenerated by lock_requirements.sh
# To update, run:
#
# sh lock_requirements.sh
#
appdirs==1.4.4
attrs==21.2.0
binaryornot==0.4.4
black==21.6b0
boolean.py==3.8
bump2version==1.0.1
certifi==2021.5.30
chardet==4.0.0
click==8.0.1
coverage==5.5
dflit-core==2.3.0.1
dflit==2.3.0.1
distlib==0.3.2
docutils==0.17.1
filelock==3.0.12
flake8-black==0.2.1
flake8-isort==4.0.0
flake8==3.9.2
fsfe-reuse==1.0.0
idna==2.10
iniconfig==1.1.1
invoke==1.5.0
isort==5.8.0
jinja2==3.0.1
license-expression==1.2
markupsafe==2.0.1
mccabe==0.6.1
mypy-extensions==0.4.3
mypy==0.902
packaging==20.9
pathspec==0.8.1
pep517==0.10.0
pip-tools==6.1.0
pluggy==0.13.1
py==1.10.0
pycodestyle==2.7.0
pyflakes==2.3.1
pyparsing==2.4.7
pytest-cov==2.12.1
pytest-html==3.1.1
pytest-metadata==1.11.0
pytest==6.2.4
python-debian==0.1.39
pytoml==0.1.21
regex==2021.4.4
requests==2.25.1
reuse==0.13.0
six==1.16.0
testfixtures==6.17.1
toml==0.10.2
tox-pyenv==1.1.0
tox==3.23.1
typing-extensions==3.10.0.0
urllib3==1.26.5
virtualenv==20.4.7
pip==21.1.2
setuptools==57.0.0
12 changes: 12 additions & 0 deletions lock_requirements.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

pip-compile --allow-unsafe --no-emit-index-url "$@"
cat >constraints.txt <<EOF
#
# This file is autogenerated by lock_requirements.sh
# To update, run:
#
# sh lock_requirements.sh
#
EOF
sed -E -e 's/(\[.*\])//g' -e '/^ *#/d' -e '/^$/d' requirements.txt >> constraints.txt
4 changes: 3 additions & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ follow_imports = silent
ignore_missing_imports = False

# Enables PEP 420 style namespace packages. (default False)
namespace_packages = True
namespace_packages = False

# explicit_package_bases = True

# Type-checks the interior of functions without type annotations (default False)
check_untyped_defs = True
Expand Down
6 changes: 3 additions & 3 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# SPDX-FileCopyrightText: David Fritzsche
# SPDX-License-Identifier: CC0-1.0
black==19.10b0
black==21.6b0
bump2version
coverage[toml]
dflit
flake8-black
flake8-isort
fsfe-reuse
invoke
mypy==0.770
mypy==0.902
pip-tools
pip>=19.3
pytest-cov
pytest-html
pytest~=5.4.1
pytest~=6.2.4
setuptools>=43
tox-pyenv
tox>=3.14.3
222 changes: 162 additions & 60 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,168 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --allow-unsafe --no-index --upgrade
# pip-compile --allow-unsafe --no-emit-index-url
#
appdirs==1.4.3 # via black, virtualenv
attrs==19.3.0 # via black, pytest
binaryornot==0.4.4 # via reuse
black==19.10b0 # via -r requirements.in, flake8-black
boolean.py==3.7 # via license-expression, reuse
bump2version==1.0.0 # via -r requirements.in
certifi==2020.4.5.1 # via requests
chardet==3.0.4 # via binaryornot, python-debian, requests
click==7.1.1 # via black, pip-tools
coverage[toml]==5.1 # via -r requirements.in, pytest-cov
dflit-core==2.2.0.1 # via dflit
dflit==2.2.0.1 # via -r requirements.in
distlib==0.3.0 # via virtualenv
docutils==0.16 # via dflit
entrypoints==0.3 # via flake8
filelock==3.0.12 # via tox, virtualenv
flake8-black==0.1.1 # via -r requirements.in
flake8-isort==3.0.0 # via -r requirements.in
flake8==3.7.9 # via flake8-black, flake8-isort
fsfe-reuse==1.0.0 # via -r requirements.in
idna==2.9 # via requests
invoke==1.4.1 # via -r requirements.in
isort[pyproject]==4.3.21 # via flake8-isort
jinja2==2.11.2 # via reuse
license-expression==1.2 # via reuse
markupsafe==1.1.1 # via jinja2
mccabe==0.6.1 # via flake8
more-itertools==8.2.0 # via pytest
mypy-extensions==0.4.3 # via mypy
mypy==0.770 # via -r requirements.in
packaging==20.3 # via pytest, tox
pathspec==0.8.0 # via black
pip-tools==5.0.0 # via -r requirements.in
pluggy==0.13.1 # via pytest, tox
py==1.8.1 # via pytest, tox
pycodestyle==2.5.0 # via flake8
pyflakes==2.1.1 # via flake8
pyparsing==2.4.7 # via packaging
pytest-cov==2.8.1 # via -r requirements.in
pytest-html==2.1.1 # via -r requirements.in
pytest-metadata==1.8.0 # via pytest-html
pytest==5.4.1 # via -r requirements.in, pytest-cov, pytest-html, pytest-metadata
python-debian==0.1.37 # via reuse
pytoml==0.1.21 # via dflit, dflit-core
regex==2020.4.4 # via black
requests==2.23.0 # via dflit, reuse
reuse==0.9.0 # via fsfe-reuse
six==1.14.0 # via packaging, pip-tools, python-debian, tox, virtualenv
testfixtures==6.14.1 # via flake8-isort
toml==0.10.0 # via black, coverage, isort, tox
tox-pyenv==1.1.0 # via -r requirements.in
tox==3.14.6 # via -r requirements.in, tox-pyenv
typed-ast==1.4.1 # via black, mypy
typing-extensions==3.7.4.2 # via mypy
urllib3==1.25.9 # via requests
virtualenv==20.0.18 # via tox
wcwidth==0.1.9 # via pytest
appdirs==1.4.4
# via
# black
# virtualenv
attrs==21.2.0
# via pytest
binaryornot==0.4.4
# via reuse
black==21.6b0
# via
# -r requirements.in
# flake8-black
boolean.py==3.8
# via
# license-expression
# reuse
bump2version==1.0.1
# via -r requirements.in
certifi==2021.5.30
# via requests
chardet==4.0.0
# via
# binaryornot
# python-debian
# requests
click==8.0.1
# via
# black
# pip-tools
coverage[toml]==5.5
# via
# -r requirements.in
# pytest-cov
dflit-core==2.3.0.1
# via dflit
dflit==2.3.0.1
# via -r requirements.in
distlib==0.3.2
# via virtualenv
docutils==0.17.1
# via dflit
filelock==3.0.12
# via
# tox
# virtualenv
flake8-black==0.2.1
# via -r requirements.in
flake8-isort==4.0.0
# via -r requirements.in
flake8==3.9.2
# via
# flake8-black
# flake8-isort
fsfe-reuse==1.0.0
# via -r requirements.in
idna==2.10
# via requests
iniconfig==1.1.1
# via pytest
invoke==1.5.0
# via -r requirements.in
isort==5.8.0
# via flake8-isort
jinja2==3.0.1
# via reuse
license-expression==1.2
# via reuse
markupsafe==2.0.1
# via jinja2
mccabe==0.6.1
# via flake8
mypy-extensions==0.4.3
# via
# black
# mypy
mypy==0.902
# via -r requirements.in
packaging==20.9
# via
# pytest
# tox
pathspec==0.8.1
# via black
pep517==0.10.0
# via pip-tools
pip-tools==6.1.0
# via -r requirements.in
pluggy==0.13.1
# via
# pytest
# tox
py==1.10.0
# via
# pytest
# tox
pycodestyle==2.7.0
# via flake8
pyflakes==2.3.1
# via flake8
pyparsing==2.4.7
# via packaging
pytest-cov==2.12.1
# via -r requirements.in
pytest-html==3.1.1
# via -r requirements.in
pytest-metadata==1.11.0
# via pytest-html
pytest==6.2.4
# via
# -r requirements.in
# pytest-cov
# pytest-html
# pytest-metadata
python-debian==0.1.39
# via reuse
pytoml==0.1.21
# via
# dflit
# dflit-core
regex==2021.4.4
# via black
requests==2.25.1
# via
# dflit
# reuse
reuse==0.13.0
# via fsfe-reuse
six==1.16.0
# via
# python-debian
# tox
# virtualenv
testfixtures==6.17.1
# via flake8-isort
toml==0.10.2
# via
# black
# coverage
# mypy
# pep517
# pytest
# pytest-cov
# tox
tox-pyenv==1.1.0
# via -r requirements.in
tox==3.23.1
# via
# -r requirements.in
# tox-pyenv
typing-extensions==3.10.0.0
# via mypy
urllib3==1.26.5
# via requests
virtualenv==20.4.7
# via tox

# The following packages are considered to be unsafe in a requirements file:
pip==20.0.2 # via -r requirements.in, pip-tools
setuptools==46.1.3 # via -r requirements.in
pip==21.1.2
# via
# -r requirements.in
# pip-tools
setuptools==57.0.0
# via -r requirements.in
3 changes: 1 addition & 2 deletions src/pytest_mypy_testing/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: 2020 David Fritzsche
# SPDX-License-Identifier: Apache-2.0 OR MIT
"""Pytest plugin to check mypy output.
"""
"""Pytest plugin to check mypy output."""

__version__ = "0.0.7"
Loading