Merge remote-tracking branch 'origin/master' into commas

Author: adamtheturtle

dev-requirements.txt

@@ -1,22 +1,23 @@
 autoflake==1.1
 check-manifest==0.36
-codecov==2.0.14 # Upload coverage data
+codecov==2.0.15 # Upload coverage data
 dodgy==0.1.9  # Look for uploaded secrets
 flake8==3.5.0  # Lint
 flake8-commas==2.0.0  # Require silicon valley commas
-flake8-quotes==0.13.0  # Require single quotes
-freezegun==0.3.9  # Freeze time in tests
-hypothesis==3.44.22  # Generate test cases
-isort==4.2.15  # Lint imports
-mypy==0.560  # Type checking
+flake8-quotes==0.14.0  # Require single quotes
+freezegun==0.3.10  # Freeze time in tests
+hypothesis==3.50.2  # Generate test cases
+isort==4.3.4  # Lint imports
+mypy==0.570  # Type checking
+>>>>>>> origin/master
 pip_check_reqs==2.0.1
 pydocstyle==2.1.1  # Lint docstrings
 pyenchant==2.0.0  # Bindings for a spellchecking sytem
-pylint==1.8.2  # Lint
+pylint==1.8.3  # Lint
 pyroma==2.3  # Packaging best practices checker
 pytest-cov==2.5.1  # Measure code coverage
 pytest-envfiles==0.1.0  # Use files for environment variables for tests
-pytest==3.3.2  # Test runners
+pytest==3.4.2  # Test runners
 timeout-decorator==0.4.0  # Decorate functions to time out.
 vulture==0.26
-yapf==0.20.1  # Automatic formatting for Python
+yapf==0.21.0  # Automatic formatting for Python