Skip to content

Commit

Permalink
Fix Makefile, bump packages (#174)
Browse files Browse the repository at this point in the history
* Fix Makefile: old 'tox' recipe is now 'test'

* Update version string in README

* Bump all requirements

* Show mypy error codes

* Don't check black files with mypy: leads to duplicate warnings
  • Loading branch information
jamescooke committed Mar 11, 2021
1 parent f2b3e39 commit 9429851
Show file tree
Hide file tree
Showing 8 changed files with 383 additions and 141 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ lintexamples:
flake8 examples/good examples/bad | sort > flake8.out
diff examples/bad/flake8_expected.out flake8.out
@echo "=== mypy ==="
mypy examples examples/good --ignore-missing-imports
mypy examples/conftest.py examples/good --ignore-missing-imports --exclude examples/good/black/
mypy examples/bad --ignore-missing-imports
@echo "=== black ==="
black --check --diff --verbose examples/good/black
Expand Down Expand Up @@ -96,11 +96,11 @@ clean:
find . -name '*.pyc' -delete

.PHONY: sdist
sdist: tox
sdist: test
python setup.py sdist

.PHONY: bdist_wheel
bdist_wheel: tox
bdist_wheel: test
python setup.py bdist_wheel

.PHONY: testpypi
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ string:
.. code-block:: shell
$ flake8 --version
3.8.3 (aaa: 0.11.0, mccabe: 0.6.1, pycodestyle: 2.6.0, pyflakes: 2.2.0) ...
3.8.4 (aaa: 0.11.1, mccabe: 0.6.1, pycodestyle: 2.6.0, pyflakes: 2.2.0) ...
The ``aaa: 0.11.0`` part tells you that Flake8-AAA was installed successfully
The ``aaa: 0.11.1`` part tells you that Flake8-AAA was installed successfully
and its checks will be used by Flake8.

Further reading:
Expand Down
26 changes: 18 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,21 @@
#
# pip-compile --output-file=base.txt base.in
#
asttokens==2.0.4 # via -r base.in
flake8==3.8.4 # via -r base.in
importlib-metadata==2.0.0 # via flake8
mccabe==0.6.1 # via flake8
pycodestyle==2.6.0 # via flake8
pyflakes==2.2.0 # via flake8
six==1.15.0 # via asttokens
zipp==3.4.0 # via importlib-metadata
asttokens==2.0.4
# via -r base.in
flake8==3.8.4
# via -r base.in
importlib-metadata==3.7.2
# via flake8
mccabe==0.6.1
# via flake8
pycodestyle==2.6.0
# via flake8
pyflakes==2.2.0
# via flake8
six==1.15.0
# via asttokens
typing-extensions==3.7.4.3
# via importlib-metadata
zipp==3.4.1
# via importlib-metadata
124 changes: 95 additions & 29 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,101 @@
#
# pip-compile --output-file=dev.txt dev.in
#
bleach==3.2.1 # via readme-renderer
certifi==2020.11.8 # via -c test.txt, requests
cffi==1.14.3 # via cryptography
chardet==3.0.4 # via -c test.txt, requests
click==7.1.2 # via pip-tools
colorama==0.4.4 # via twine
cryptography==3.2.1 # via secretstorage
docutils==0.16 # via -c test.txt, readme-renderer
idna==2.10 # via -c test.txt, requests
importlib-metadata==2.0.0 # via -c base.txt, -c test.txt, keyring, twine
jeepney==0.5.0 # via keyring, secretstorage
keyring==21.5.0 # via twine
packaging==20.4 # via -c test.txt, bleach
pip-tools==5.3.1 # via -r dev.in
pkginfo==1.6.1 # via twine
pycparser==2.20 # via cffi
pygments==2.7.2 # via -c test.txt, readme-renderer
pyparsing==2.4.7 # via -c test.txt, packaging
readme-renderer==28.0 # via twine
requests-toolbelt==0.9.1 # via twine
requests==2.25.0 # via -c test.txt, requests-toolbelt, twine
rfc3986==1.4.0 # via twine
secretstorage==3.2.0 # via keyring
six==1.15.0 # via -c base.txt, -c test.txt, bleach, cryptography, packaging, pip-tools, readme-renderer
tqdm==4.51.0 # via twine
twine==3.2.0 # via -r dev.in
urllib3==1.26.2 # via -c test.txt, requests
webencodings==0.5.1 # via bleach
zipp==3.4.0 # via -c base.txt, -c test.txt, importlib-metadata
bleach==3.3.0
# via readme-renderer
certifi==2020.12.5
# via
# -c test.txt
# requests
cffi==1.14.5
# via cryptography
chardet==4.0.0
# via
# -c test.txt
# requests
click==7.1.2
# via pip-tools
colorama==0.4.4
# via twine
cryptography==3.4.6
# via secretstorage
docutils==0.16
# via
# -c test.txt
# readme-renderer
idna==2.10
# via
# -c test.txt
# requests
importlib-metadata==3.7.2
# via
# -c base.txt
# -c test.txt
# keyring
# twine
jeepney==0.6.0
# via
# keyring
# secretstorage
keyring==23.0.0
# via twine
packaging==20.9
# via
# -c test.txt
# bleach
pip-tools==5.5.0
# via -r dev.in
pkginfo==1.7.0
# via twine
pycparser==2.20
# via cffi
pygments==2.8.1
# via
# -c test.txt
# readme-renderer
pyparsing==2.4.7
# via
# -c test.txt
# packaging
readme-renderer==29.0
# via twine
requests-toolbelt==0.9.1
# via twine
requests==2.25.1
# via
# -c test.txt
# requests-toolbelt
# twine
rfc3986==1.4.0
# via twine
secretstorage==3.3.1
# via keyring
six==1.15.0
# via
# -c base.txt
# -c test.txt
# bleach
# readme-renderer
tqdm==4.59.0
# via twine
twine==3.3.0
# via -r dev.in
typing-extensions==3.7.4.3
# via
# -c base.txt
# -c test.txt
# importlib-metadata
urllib3==1.26.3
# via
# -c test.txt
# requests
webencodings==0.5.1
# via bleach
zipp==3.4.1
# via
# -c base.txt
# -c test.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
87 changes: 61 additions & 26 deletions requirements/examples-py36.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,65 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=examples.txt examples.in
# pip-compile --output-file=examples-py36.txt examples.in
#
appdirs==1.4.4 # via black
attrs==20.3.0 # via pytest
black==20.8b1 # via -r examples.in
click==7.1.2 # via black
dataclasses==0.8 # via black
flake8==3.8.4 # via -r examples.in
importlib-metadata==2.0.0 # via flake8, pluggy, pytest
iniconfig==1.1.1 # via pytest
mccabe==0.6.1 # via flake8
mypy-extensions==0.4.3 # via black, mypy
mypy==0.790 # via -r examples.in
packaging==20.4 # via pytest
pathspec==0.8.1 # via black
pluggy==0.13.1 # via pytest
py==1.9.0 # via pytest
pycodestyle==2.6.0 # via flake8
pyflakes==2.2.0 # via flake8
pyparsing==2.4.7 # via packaging
pytest==6.1.2 # via -r examples.in
regex==2020.11.13 # via black
six==1.15.0 # via packaging
toml==0.10.2 # via black, pytest
typed-ast==1.4.1 # via black, mypy
typing-extensions==3.7.4.3 # via black, mypy
zipp==3.4.0 # via importlib-metadata
appdirs==1.4.4
# via black
attrs==20.3.0
# via pytest
black==20.8b1
# via -r examples.in
click==7.1.2
# via black
dataclasses==0.8
# via black
flake8==3.8.4
# via -r examples.in
importlib-metadata==3.7.2
# via
# flake8
# pluggy
# pytest
iniconfig==1.1.1
# via pytest
mccabe==0.6.1
# via flake8
mypy-extensions==0.4.3
# via
# black
# mypy
mypy==0.812
# via -r examples.in
packaging==20.9
# via pytest
pathspec==0.8.1
# via black
pluggy==0.13.1
# via pytest
py==1.10.0
# via pytest
pycodestyle==2.6.0
# via flake8
pyflakes==2.2.0
# via flake8
pyparsing==2.4.7
# via packaging
pytest==6.2.2
# via -r examples.in
regex==2020.11.13
# via black
toml==0.10.2
# via
# black
# pytest
typed-ast==1.4.2
# via
# black
# mypy
typing-extensions==3.7.4.3
# via
# black
# importlib-metadata
# mypy
zipp==3.4.1
# via importlib-metadata
80 changes: 58 additions & 22 deletions requirements/examples.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,61 @@
#
# pip-compile --output-file=examples.txt examples.in
#
appdirs==1.4.4 # via black
attrs==20.3.0 # via pytest
black==20.8b1 # via -r examples.in
click==7.1.2 # via black
flake8==3.8.4 # via -r examples.in
iniconfig==1.1.1 # via pytest
mccabe==0.6.1 # via flake8
mypy-extensions==0.4.3 # via black, mypy
mypy==0.790 # via -r examples.in
packaging==20.4 # via pytest
pathspec==0.8.1 # via black
pluggy==0.13.1 # via pytest
py==1.9.0 # via pytest
pycodestyle==2.6.0 # via flake8
pyflakes==2.2.0 # via flake8
pyparsing==2.4.7 # via packaging
pytest==6.1.2 # via -r examples.in
regex==2020.11.13 # via black
six==1.15.0 # via packaging
toml==0.10.2 # via black, pytest
typed-ast==1.4.1 # via black, mypy
typing-extensions==3.7.4.3 # via black, mypy
appdirs==1.4.4
# via black
attrs==20.3.0
# via pytest
black==20.8b1
# via -r examples.in
click==7.1.2
# via black
flake8==3.8.4
# via -r examples.in
importlib-metadata==3.7.2
# via
# flake8
# pluggy
# pytest
iniconfig==1.1.1
# via pytest
mccabe==0.6.1
# via flake8
mypy-extensions==0.4.3
# via
# black
# mypy
mypy==0.812
# via -r examples.in
packaging==20.9
# via pytest
pathspec==0.8.1
# via black
pluggy==0.13.1
# via pytest
py==1.10.0
# via pytest
pycodestyle==2.6.0
# via flake8
pyflakes==2.2.0
# via flake8
pyparsing==2.4.7
# via packaging
pytest==6.2.2
# via -r examples.in
regex==2020.11.13
# via black
toml==0.10.2
# via
# black
# pytest
typed-ast==1.4.2
# via
# black
# mypy
typing-extensions==3.7.4.3
# via
# black
# importlib-metadata
# mypy
zipp==3.4.1
# via importlib-metadata

0 comments on commit 9429851

Please sign in to comment.