Skip to content

Commit fa8fb68

Browse files
authored
Merge branch 'master' into mypy
2 parents 0d373b2 + 0c1ac37 commit fa8fb68

4 files changed

Lines changed: 63 additions & 18 deletions

File tree

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ matrix:
2626
env: TOXENV=test-pypy3,codecov
2727
- python: "2.7"
2828
env: TOXENV=packaging-py27
29+
- python: "3.8"
30+
env: TOXENV=docs
2931

3032

3133
install:

docs/api.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ URLs have many parts, and URL objects have many attributes to represent them.
6161
.. autoattribute:: hyperlink.URL.userinfo
6262
.. autoattribute:: hyperlink.URL.user
6363
.. autoattribute:: hyperlink.URL.rooted
64-
.. autoattribute:: hyperlink.URL.family
6564

6665
Low-level functions
6766
-------------------
@@ -70,6 +69,6 @@ A couple of notable helpers used by the :class:`~hyperlink.URL` type.
7069

7170
.. autoclass:: hyperlink.URLParseError
7271
.. autofunction:: hyperlink.register_scheme
73-
.. autofunction:: hyperlink.parse_host
72+
.. autofunction:: hyperlink.parse
7473

7574
.. TODO: run doctests in docs?

src/hyperlink/__init__.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
from ._url import (
2+
parse,
3+
register_scheme,
4+
URL,
5+
EncodedURL,
6+
DecodedURL,
7+
URLParseError,
8+
)
19

2-
from ._url import (URL,
3-
parse,
4-
EncodedURL,
5-
DecodedURL,
6-
URLParseError,
7-
register_scheme)
8-
9-
__all__ = [
10-
"URL",
10+
__all__ = (
1111
"parse",
12+
"register_scheme",
13+
"URL",
1214
"EncodedURL",
1315
"DecodedURL",
1416
"URLParseError",
15-
"register_scheme",
16-
]
17+
)

tox.ini

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ envlist =
55
test-py{26,27,34,35,36,37,38,py,py3}
66
coverage_report
77
packaging
8+
docs
89

910
skip_missing_interpreters = {tty:True:False}
1011

@@ -218,11 +219,53 @@ deps =
218219
commands =
219220
coverage combine
220221
coverage xml -o "{env:COVERAGE_XML}"
221-
codecov --file="{env:COVERAGE_XML}" --env \
222-
GITHUB_REF GITHUB_COMMIT GITHUB_USER GITHUB_WORKFLOW \
223-
TRAVIS_BRANCH TRAVIS_BUILD_WEB_URL TRAVIS_COMMIT TRAVIS_COMMIT_MESSAGE \
224-
APPVEYOR_REPO_BRANCH APPVEYOR_REPO_COMMIT \
225-
APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
222+
codecov --file="{env:COVERAGE_XML}" --env \
223+
GITHUB_REF GITHUB_COMMIT GITHUB_USER GITHUB_WORKFLOW \
224+
TRAVIS_BRANCH TRAVIS_BUILD_WEB_URL \
225+
TRAVIS_COMMIT TRAVIS_COMMIT_MESSAGE \
226+
APPVEYOR_REPO_BRANCH APPVEYOR_REPO_COMMIT \
227+
APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL \
228+
APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
229+
230+
231+
##
232+
# Documentation
233+
##
234+
235+
[testenv:docs]
236+
237+
description = build documentation
238+
239+
basepython = python3.8
240+
241+
deps =
242+
Sphinx==2.2.1
243+
sphinx-rtd-theme==0.4.3
244+
245+
commands =
246+
sphinx-build \
247+
-b html -d "{envtmpdir}/doctrees" \
248+
"{toxinidir}/docs" \
249+
"{toxworkdir}/docs/html"
250+
251+
252+
[testenv:docs-auto]
253+
254+
description = build documentation and rebuild automatically
255+
256+
basepython = python3.8
257+
258+
deps =
259+
Sphinx==2.2.1
260+
sphinx-rtd-theme==0.4.3
261+
sphinx-autobuild==0.7.1
262+
263+
commands =
264+
sphinx-autobuild \
265+
-b html -d "{envtmpdir}/doctrees" \
266+
--host=localhost \
267+
"{toxinidir}/docs" \
268+
"{toxworkdir}/docs/html"
226269

227270

228271
##

0 commit comments

Comments
 (0)