Permalink
Browse files

Merge branch 'master' into issue-1538

  • Loading branch information...
2 parents 9f8efb2 + 91ecacb commit 18107aeee0644bf7e8f8750efa63cb64153d3a85 @jaraco jaraco committed on GitHub Dec 27, 2016
Showing with 6 additions and 7 deletions.
  1. +2 −2 .travis.yml
  2. +3 −4 docs/conf.py
  3. +1 −1 tox.ini
View
@@ -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
View
@@ -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',
),
],
),
}
-
View
@@ -12,7 +12,7 @@ extras =
testing
routes_dispatcher
-[testenv:linter]
+[testenv:pre-commit]
deps = pre-commit
commands = pre-commit run --all-files {posargs}

0 comments on commit 18107ae

Please sign in to comment.