Merge branch 'master' into issue-1538

jaraco · web-flow · commit 18107aeee064 · 2016-12-27T12:20:12.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,10 +17,10 @@ matrix:
     - python: pypy
     # TODO: fix tests
     - python: pypy3
-    - env: TOXENV=linter
+    - env: TOXENV=pre-commit
   include:
     - python: 3.5
-      env: TOXENV=linter
+      env: TOXENV=pre-commit
   include:
     - python: 3.5
       env: TOXENV=dist-check
diff --git a/docs/conf.py b/docs/conf.py
@@ -291,14 +291,13 @@ def __getattr__(cls, name):
         ),
         replace=[
             dict(
-                pattern=r"(Issue )?#(?P<issue>\d+)",
+                pattern=r'(Issue )?#(?P<issue>\d+)',
                 url='{url}/issues/{issue}',
             ),
             dict(
-                pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
-                with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
+                pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
+                with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
             ),
         ],
     ),
 }
-
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,7 @@ extras =
     testing
     routes_dispatcher
 
-[testenv:linter]
+[testenv:pre-commit]
 deps = pre-commit
 commands = pre-commit run --all-files {posargs}
 
