Merge pull request #4100 from nicoddemus/merge-master-into-features

Merge master into features

Author: asottile

.pre-commit-config.yaml

@@ -7,13 +7,13 @@ repos:
         args: [--safe, --quiet]
         language_version: python3
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v0.2.0
+    rev: v0.3.0
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==18.6b4]
+        additional_dependencies: [black==18.9b0]
         language_version: python3
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.3.0
+    rev: v1.4.0-1
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -22,11 +22,12 @@ repos:
         exclude: _pytest/debugging.py
     -   id: flake8
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.2.0
+    rev: v1.8.0
     hooks:
-    - id: pyupgrade
+    -   id: pyupgrade
+        args: [--keep-percent-format]
 -   repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.0.0
+    rev: v1.1.0
     hooks:
     -   id: rst-backticks
 -   repo: local

bench/bench_argcomplete.py

@@ -1,5 +1,3 @@
-
-
 # 10000 iterations, just for relative comparison
 #                      2.7.5     3.3.2
 # FilesCompleter       75.1109   69.2116

bench/manyparam.py

@@ -1,4 +1,3 @@
-
 import pytest
 
 

changelog/2535.bugfix.rst

@@ -0,0 +1 @@
+Improve error message when test functions of ``unittest.TestCase`` subclasses use a parametrized fixture.

changelog/3057.bugfix.rst

@@ -0,0 +1 @@
+``request.fixturenames`` now correctly returns the name of fixtures created by ``request.getfixturevalue()``.

changelog/4058.doc.rst

@@ -0,0 +1 @@
+Update fixture documentation to specify that a fixture can be invoked twice in the scope it's defined for.

changelog/4064.doc.rst

@@ -0,0 +1 @@
+According to unittest.rst, setUpModule and tearDownModule were not implemented, but it turns out they are. So updated the documentation for unittest.

changelog/4066.bugfix.rst

@@ -0,0 +1 @@
+Fix source reindenting by using ``textwrap.dedent`` directly.

doc/en/announce/release-3.6.3.rst

@@ -20,8 +20,7 @@ Thanks to all who contributed to this release, among them:
 * Ondřej Súkup
 * Ronny Pfannschmidt
 * T.E.A de Souza
-* Victor
-* victor
+* Victor Maryama
 
 
 Happy testing,

doc/en/announce/release-3.7.3.rst

@@ -22,10 +22,9 @@ Thanks to all who contributed to this release, among them:
 * Ronny Pfannschmidt
 * Sankt Petersbug
 * Tyler Richard
-* Victor
+* Victor Maryama
 * Vlad Shcherbina
 * turturica
-* victor
 * wim glenn