Merge https://github.com/jaraco/skeleton

jaraco · Jun 14, 2018 · d11a43d · d11a43d
2 parents 3261e31 + 67c79e3
commit d11a43d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,6 @@ jobs:
         secure: aDqlVdm6FZ8pqLkoDRR2LH3TEz7pBvKH2HhOlSy7OEmopN/36ncql/KvfE0ccpaOES9Xm31a51bUfNjcwb1HVKjfW544C+IoSHctkG1rI5bp3q4rW+4RbQcBZVHUUKR9yQf9ZyikEmoYXi3g+JKcOf9rj+v/32PAfUDzSpFbWik=
       distributions: dists
       skip_cleanup: true
-      skip_upload_docs: true
 
 cache: pip
 
@@ -33,4 +32,9 @@ before_install:
 install:
 - pip install tox tox-venv
 
+before_script:
+  # Disable IPv6. Ref travis-ci/travis-ci#8361
+  - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+      sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
+    fi
 script: tox
diff --git a/docs/conf.py b/docs/conf.py
@@ -17,7 +17,7 @@
 		),
 		replace=[
 			dict(
-				pattern=r'(Issue )?#(?P<issue>\d+)',
+				pattern=r'(Issue #|\B#)(?P<issue>\d+)',
 				url='{package_url}/issues/{issue}',
 			),
 			dict(

diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,7 @@ deps =
 	# workaround for yaml/pyyaml#126
 	# git+https://github.com/yaml/pyyaml@master#egg=pyyaml;python_version=="3.7"
 commands =
-	py.test {posargs}
+	pytest {posargs}
 	python setup.py checkdocs
 usedevelop = True
 extras = testing