Bump requirements, update flake8 options object (#179)

* Bump requirements: built with py36

* Bump examples.txt with py37

* Add temp recipe for examples reqs on py36

* Add extra flake8 option

requirements/Makefile

@@ -7,6 +7,10 @@ all: $(outputs)
 %.txt: %.in
 	pip-compile --verbose --output-file $@ $<
 
+# Temporary helper: remove when py36 goes
+examples-py36.txt: examples.in
+	pip-compile examples.in --output-file examples-py36.txt
+
 # Dependency chain
 test.txt: base.txt
 dev.txt: test.txt

requirements/base.txt

@@ -6,15 +6,15 @@
 #
 asttokens==2.0.4
     # via -r base.in
-flake8==3.8.4
+flake8==3.9.0
     # via -r base.in
-importlib-metadata==3.7.2
+importlib-metadata==3.10.0
     # via flake8
 mccabe==0.6.1
     # via flake8
-pycodestyle==2.6.0
+pycodestyle==2.7.0
     # via flake8
-pyflakes==2.2.0
+pyflakes==2.3.1
     # via flake8
 six==1.15.0
     # via asttokens

requirements/dev.txt

@@ -20,7 +20,7 @@ click==7.1.2
     # via pip-tools
 colorama==0.4.4
     # via twine
-cryptography==3.4.6
+cryptography==3.4.7
     # via secretstorage
 docutils==0.16
     # via
@@ -30,23 +30,26 @@ idna==2.10
     # via
     #   -c test.txt
     #   requests
-importlib-metadata==3.7.2
+importlib-metadata==3.10.0
     # via
     #   -c base.txt
     #   -c test.txt
     #   keyring
+    #   pep517
     #   twine
 jeepney==0.6.0
     # via
     #   keyring
     #   secretstorage
-keyring==23.0.0
+keyring==23.0.1
     # via twine
 packaging==20.9
     # via
     #   -c test.txt
     #   bleach
-pip-tools==5.5.0
+pep517==0.10.0
+    # via pip-tools
+pip-tools==6.0.1
     # via -r dev.in
 pkginfo==1.7.0
     # via twine
@@ -79,16 +82,20 @@ six==1.15.0
     #   -c test.txt
     #   bleach
     #   readme-renderer
-tqdm==4.59.0
+toml==0.10.2
+    # via
+    #   -c test.txt
+    #   pep517
+tqdm==4.60.0
     # via twine
-twine==3.3.0
+twine==3.4.1
     # via -r dev.in
 typing-extensions==3.7.4.3
     # via
     #   -c base.txt
     #   -c test.txt
     #   importlib-metadata
-urllib3==1.26.3
+urllib3==1.26.4
     # via
     #   -c test.txt
     #   requests
@@ -99,7 +106,7 @@ zipp==3.4.1
     #   -c base.txt
     #   -c test.txt
     #   importlib-metadata
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
-# setuptools

requirements/examples-py36.txt

@@ -14,9 +14,9 @@ click==7.1.2
     # via black
 dataclasses==0.8
     # via black
-flake8==3.8.4
+flake8==3.9.0
     # via -r examples.in
-importlib-metadata==3.7.2
+importlib-metadata==3.10.0
     # via
     #   flake8
     #   pluggy
@@ -39,15 +39,15 @@ pluggy==0.13.1
     # via pytest
 py==1.10.0
     # via pytest
-pycodestyle==2.6.0
+pycodestyle==2.7.0
     # via flake8
-pyflakes==2.2.0
+pyflakes==2.3.1
     # via flake8
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.2
+pytest==6.2.3
     # via -r examples.in
-regex==2020.11.13
+regex==2021.4.4
     # via black
 toml==0.10.2
     # via

requirements/examples.txt

@@ -12,9 +12,9 @@ black==20.8b1
     # via -r examples.in
 click==7.1.2
     # via black
-flake8==3.8.4
+flake8==3.9.0
     # via -r examples.in
-importlib-metadata==3.7.2
+importlib-metadata==3.10.0
     # via
     #   flake8
     #   pluggy
@@ -37,15 +37,15 @@ pluggy==0.13.1
     # via pytest
 py==1.10.0
     # via pytest
-pycodestyle==2.6.0
+pycodestyle==2.7.0
     # via flake8
-pyflakes==2.2.0
+pyflakes==2.3.1
     # via flake8
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.2
+pytest==6.2.3
     # via -r examples.in
-regex==2020.11.13
+regex==2021.4.4
     # via black
 toml==0.10.2
     # via

requirements/test.txt

@@ -22,19 +22,20 @@ docutils==0.16
     # via
     #   restructuredtext-lint
     #   sphinx
+    #   sphinx-rtd-theme
 filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-flake8==3.8.4
+flake8==3.9.0
     # via
     #   -c base.txt
     #   -r test.in
 idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
-importlib-metadata==3.7.2
+importlib-metadata==3.10.0
     # via
     #   -c base.txt
     #   flake8
@@ -46,7 +47,7 @@ importlib-resources==5.1.2
     # via virtualenv
 iniconfig==1.1.1
     # via pytest
-isort==5.7.0
+isort==5.8.0
     # via -r test.in
 jinja2==2.11.3
     # via sphinx
@@ -75,11 +76,11 @@ py==1.10.0
     # via
     #   pytest
     #   tox
-pycodestyle==2.6.0
+pycodestyle==2.7.0
     # via
     #   -c base.txt
     #   flake8
-pyflakes==2.2.0
+pyflakes==2.3.1
     # via
     #   -c base.txt
     #   flake8
@@ -105,9 +106,9 @@ six==1.15.0
     #   virtualenv
 snowballstemmer==2.1.0
     # via sphinx
-sphinx-rtd-theme==0.5.1
+sphinx-rtd-theme==0.5.2
     # via -r test.in
-sphinx==3.5.2
+sphinx==3.5.3
     # via
     #   -r test.in
     #   sphinx-rtd-theme
@@ -136,11 +137,11 @@ typing-extensions==3.7.4.3
     #   -c base.txt
     #   importlib-metadata
     #   mypy
-urllib3==1.26.3
+urllib3==1.26.4
     # via requests
-virtualenv==20.4.2
+virtualenv==20.4.3
     # via tox
-yapf==0.30.0
+yapf==0.31.0
     # via -r test.in
 zipp==3.4.1
     # via

tests/conftest.py

@@ -10,6 +10,7 @@
 
 class FakeOptions:
     hang_closing: bool
+    indent_size: int
     max_line_length: int
     max_doc_length: int
     verbose: bool
@@ -19,6 +20,7 @@ class FakeOptions:
 def fake_options() -> FakeOptions:
     options = FakeOptions()
     options.hang_closing = False
+    options.indent_size = 4
     options.max_line_length = MAX_LINE_LENGTH
     options.max_doc_length = MAX_LINE_LENGTH
     options.verbose = False