Bump requirements, squash merge from now on (#168)

* Bump all requirements

* Add note about "squash merging"

* Split out separate py36 example requirements

* Use different requirements file for py36 examples

* Simplify Makefile: don't force particular venv

Makefile

@@ -8,21 +8,14 @@ good_examples = $(wildcard examples/good/*.py examples/good/black/*.py) examples
 bad_examples = $(wildcard examples/good/noqa/test_0*.py examples/good/black/noqa/test_0*.py examples/bad/*.py)
 
 
-venv:
-	virtualenv venv --python=python3
-	venv/bin/pip install -U pip
-
-venv/bin/pip-sync: venv
-	venv/bin/pip install pip-tools
-
 # Local dev: Install requirements
 .PHONY: dev
-dev: venv venv/bin/pip-sync
-	venv/bin/pip-sync requirements/base.txt requirements/test.txt requirements/dev.txt
+dev:
+	pip-sync requirements/base.txt requirements/test.txt requirements/dev.txt
 
 # Local dev: Run all tests for available Python versions
-.PHONY: tox
-tox:
+.PHONY: test
+test:
 	tox --skip-missing-interpreters true
 
 # --- Tox recipes ---

docs/release_checklist.rst

@@ -33,7 +33,8 @@ using the output of the ``cmd`` and ``cmdbad`` ``tox`` environments.
 Merge
 -----
 
-* When branch ``bump-vx.y.z`` is green, then merge it to ``master``.
+* When branch ``bump-vx.y.z`` is green, then merge it to ``master``. All pull
+  requests are "squash merged".
 
 * Update master locally and ensure that you remain on master for the rest of
   the process.

requirements/base.txt

@@ -5,10 +5,10 @@
 #    pip-compile --output-file=base.txt base.in
 #
 asttokens==2.0.4          # via -r base.in
-flake8==3.8.3             # via -r base.in
-importlib-metadata==1.7.0  # via flake8
+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.1.0               # via importlib-metadata
+zipp==3.4.0               # via importlib-metadata

requirements/dev.txt

@@ -4,35 +4,35 @@
 #
 #    pip-compile --output-file=dev.txt dev.in
 #
-bleach==3.1.5             # via readme-renderer
-certifi==2020.6.20        # via -c test.txt, requests
-cffi==1.14.0              # via cryptography
+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.3           # via twine
-cryptography==3.0         # via secretstorage
+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==1.7.0  # via -c base.txt, -c test.txt, keyring, twine
-jeepney==0.4.3            # via keyring, secretstorage
-keyring==21.2.1           # via twine
+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.2.1          # via -r dev.in
-pkginfo==1.5.0.1          # via twine
+pip-tools==5.3.1          # via -r dev.in
+pkginfo==1.6.1            # via twine
 pycparser==2.20           # via cffi
-pygments==2.6.1           # via -c test.txt, readme-renderer
+pygments==2.7.2           # via -c test.txt, readme-renderer
 pyparsing==2.4.7          # via -c test.txt, packaging
-readme-renderer==26.0     # via twine
+readme-renderer==28.0     # via twine
 requests-toolbelt==0.9.1  # via twine
-requests==2.24.0          # via -c test.txt, requests-toolbelt, twine
+requests==2.25.0          # via -c test.txt, requests-toolbelt, twine
 rfc3986==1.4.0            # via twine
-secretstorage==3.1.2      # via keyring
+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.48.0              # via twine
+tqdm==4.51.0              # via twine
 twine==3.2.0              # via -r dev.in
-urllib3==1.25.9           # via -c test.txt, requests
+urllib3==1.26.2           # via -c test.txt, requests
 webencodings==0.5.1       # via bleach
-zipp==3.1.0               # via -c base.txt, -c test.txt, importlib-metadata
+zipp==3.4.0               # via -c base.txt, -c test.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/examples-py36.txt

@@ -0,0 +1,31 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    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
+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

requirements/examples.txt

@@ -5,27 +5,24 @@
 #    pip-compile --output-file=examples.txt examples.in
 #
 appdirs==1.4.4            # via black
-attrs==19.3.0             # via black, pytest
-black==19.10b0            # via -r examples.in
+attrs==20.3.0             # via pytest
+black==20.8b1             # via -r examples.in
 click==7.1.2              # via black
-flake8==3.8.3             # via -r examples.in
-importlib-metadata==1.7.0  # via flake8, pluggy, pytest
+flake8==3.8.4             # via -r examples.in
+iniconfig==1.1.1          # via pytest
 mccabe==0.6.1             # via flake8
-more-itertools==8.4.0     # via pytest
-mypy-extensions==0.4.3    # via mypy
-mypy==0.782               # via -r examples.in
+mypy-extensions==0.4.3    # via black, mypy
+mypy==0.790               # via -r examples.in
 packaging==20.4           # via pytest
-pathspec==0.8.0           # via black
+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==5.4.3             # via -r examples.in
-regex==2020.7.14          # via black
+pytest==6.1.2             # via -r examples.in
+regex==2020.11.13         # via black
 six==1.15.0               # via packaging
-toml==0.10.1              # via black
+toml==0.10.2              # via black, pytest
 typed-ast==1.4.1          # via black, mypy
-typing-extensions==3.7.4.2  # via mypy
-wcwidth==0.2.5            # via pytest
-zipp==3.1.0               # via importlib-metadata
+typing-extensions==3.7.4.3  # via black, mypy

requirements/test.txt

@@ -6,55 +6,55 @@
 #
 alabaster==0.7.12         # via sphinx
 appdirs==1.4.4            # via virtualenv
-attrs==19.3.0             # via pytest
-babel==2.8.0              # via sphinx
-certifi==2020.6.20        # via requests
+attrs==20.3.0             # via pytest
+babel==2.9.0              # via sphinx
+certifi==2020.11.8        # via requests
 chardet==3.0.4            # via requests
 distlib==0.3.1            # via virtualenv
 docutils==0.16            # via restructuredtext-lint, sphinx
 filelock==3.0.12          # via tox, virtualenv
-flake8==3.8.3             # via -c base.txt, -r test.in
+flake8==3.8.4             # via -c base.txt, -r test.in
 idna==2.10                # via requests
 imagesize==1.2.0          # via sphinx
-importlib-metadata==1.7.0  # via -c base.txt, flake8, pluggy, pytest, tox, virtualenv
-importlib-resources==3.0.0  # via virtualenv
-iniconfig==1.0.0          # via pytest
-isort==5.1.4              # via -r test.in
+importlib-metadata==2.0.0  # via -c base.txt, flake8, pluggy, pytest, tox, virtualenv
+importlib-resources==3.3.0  # via virtualenv
+iniconfig==1.1.1          # via pytest
+isort==5.6.4              # via -r test.in
 jinja2==2.11.2            # via sphinx
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via -c base.txt, flake8
-more-itertools==8.4.0     # via pytest
+more-itertools==8.6.0     # via pytest
 mypy-extensions==0.4.3    # via mypy
-mypy==0.782               # via -r test.in
+mypy==0.790               # via -r test.in
 packaging==20.4           # via pytest, sphinx, tox
 pluggy==0.13.1            # via pytest, tox
 py==1.9.0                 # via pytest, tox
 pycodestyle==2.6.0        # via -c base.txt, flake8
 pyflakes==2.2.0           # via -c base.txt, flake8
-pygments==2.6.1           # via -r test.in, sphinx
+pygments==2.7.2           # via -r test.in, sphinx
 pyparsing==2.4.7          # via packaging
 pytest==6.0.0rc1          # via -r test.in
-pytz==2020.1              # via babel
-requests==2.24.0          # via sphinx
+pytz==2020.4              # via babel
+requests==2.25.0          # via sphinx
 restructuredtext-lint==1.3.1  # via -r test.in
 six==1.15.0               # via -c base.txt, -r test.in, packaging, tox, virtualenv
 snowballstemmer==2.0.0    # via sphinx
 sphinx-rtd-theme==0.5.0   # via -r test.in
-sphinx==3.1.2             # via -r test.in, sphinx-rtd-theme
+sphinx==3.3.1             # via -r test.in, sphinx-rtd-theme
 sphinxcontrib-applehelp==1.0.2  # via sphinx
 sphinxcontrib-devhelp==1.0.2  # via sphinx
 sphinxcontrib-htmlhelp==1.0.3  # via sphinx
 sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-qthelp==1.0.3  # via sphinx
 sphinxcontrib-serializinghtml==1.1.4  # via sphinx
-toml==0.10.1              # via pytest, tox
-tox==3.17.1               # via -r test.in
+toml==0.10.2              # via pytest, tox
+tox==3.20.1               # via -r test.in
 typed-ast==1.4.1          # via mypy
-typing-extensions==3.7.4.2  # via mypy
-urllib3==1.25.9           # via requests
-virtualenv==20.0.27       # via tox
+typing-extensions==3.7.4.3  # via mypy
+urllib3==1.26.2           # via requests
+virtualenv==20.1.0        # via tox
 yapf==0.30.0              # via -r test.in
-zipp==3.1.0               # via -c base.txt, importlib-metadata, importlib-resources
+zipp==3.4.0               # via -c base.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

tox.ini

@@ -36,7 +36,8 @@ envlist = py3{6,7,8}-{install,lint,examples,examples_aaa,test,cmd,cmdbad},py36-d
 deps =
     doc,lint,test: -rrequirements/base.txt
     doc,lint,test: -rrequirements/test.txt
-    examples: -rrequirements/examples.txt
+    py36-examples: -rrequirements/examples-py36.txt
+    py3{7,8}-examples: -rrequirements/examples.txt
     examples_aaa: flake8>=3
     install: flake8>=3
 commands =