Skip to content

Commit 0e79592

Browse files
ambvambv
committed
Merge branch 'master' into constant_phases
2 parents 8cff6aa + 3e500bb commit 0e79592

37 files changed

+467
-229
lines changed

‎.appveyor.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# To activate, change the Appveyor settings to use `.appveyor.yml`.
1+
image: Visual Studio 2019
22
environment:
33
global:
44
PATH: "C:\\Python27\\Scripts\\;%PATH%"
@@ -9,10 +9,6 @@ environment:
99
- TOXENV: py35-optional
1010
- TOXENV: py36-base
1111
- TOXENV: py36-optional
12-
- TOXENV: py37-base
13-
- TOXENV: py37-optional
14-
- TOXENV: py38-base
15-
- TOXENV: py38-optional
1612

1713
install:
1814
- git submodule update --init --recursive

‎.github/workflows/python-tox.yml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
on: [pull_request, push]
2+
jobs:
3+
build:
4+
# Prevent duplicate builds for 'internal' pull requests on existing commits
5+
# Credit: https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012
6+
if: github.event.push || github.event.pull_request.head.repo.full_name != github.repository
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
# 2.7, 3.5, and 3.6 run on Windows via AppVeyor
11+
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
12+
os: [ubuntu-latest, windows-latest]
13+
deps: [base, optional]
14+
include:
15+
- python: "pypy-2.7"
16+
os: ubuntu-latest
17+
deps: base
18+
- python: "pypy-3.8"
19+
os: ubuntu-latest
20+
deps: base
21+
- python: "2.7"
22+
os: ubuntu-latest
23+
deps: oldest
24+
- python: "3.7"
25+
os: ubuntu-latest
26+
deps: oldest
27+
runs-on: ${{ matrix.os }}
28+
steps:
29+
- uses: actions/checkout@v3
30+
with:
31+
submodules: true
32+
- if: ${{ matrix.deps == 'base' }}
33+
uses: actions/setup-python@v4
34+
with:
35+
python-version: ${{ matrix.python }}
36+
cache: pip
37+
cache-dependency-path: |
38+
requirements.txt
39+
requirements-test.txt
40+
- if: ${{ matrix.deps == 'optional' }}
41+
uses: actions/setup-python@v4
42+
with:
43+
python-version: ${{ matrix.python }}
44+
cache: pip
45+
cache-dependency-path: |
46+
requirements.txt
47+
requirements-optional.txt
48+
requirements-test.txt
49+
- if: ${{ matrix.deps == 'oldest' }}
50+
uses: actions/setup-python@v4
51+
with:
52+
python-version: ${{ matrix.python }}
53+
cache: pip
54+
cache-dependency-path: |
55+
requirements-oldest.txt
56+
- if: ${{ matrix.os == 'windows-latest' }}
57+
name: Determine environment name for Tox (PowerShell)
58+
run: python toxver.py ${{ matrix.python }} ${{ matrix.deps }} >> $env:GITHUB_ENV
59+
- if: ${{ matrix.os == 'ubuntu-latest' }}
60+
name: Determine environment name for Tox (Bash)
61+
run: python toxver.py ${{ matrix.python }} ${{ matrix.deps }} >> $GITHUB_ENV
62+
- run: pip install tox
63+
- run: tox
64+
- if: ${{ always() }}
65+
run: python debug-info.py

‎.pytest.expect

+108-76
Large diffs are not rendered by default.

‎.travis.yml

-25
This file was deleted.

‎CHANGES.rst

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
11
Change Log
22
----------
33

4+
1.2
5+
~~~
6+
7+
Unreleased yet
8+
9+
Features:
10+
11+
* Add support for the ``<wbr>`` element in the sanitizer, `which indicates
12+
a line break opportunity <https://html.spec.whatwg.org/#the-wbr-element>`_.
13+
This element is allowed by default. (#395) (Thank you, Tom Most!)
14+
* Add support for serializing the ``<ol reversed>`` boolean attribute. (Thank
15+
you, Tom Most!) (#396)
16+
* The ``<ol reversed>`` and ``<ol start>`` attributes are now permitted by the
17+
sanitizer. (#321) (Thank you, Tom Most!)
18+
19+
Bug fixes:
20+
21+
* The sanitizer now permits ``<summary>`` tags. It used to allow ``<details>``
22+
already. (#423)
23+
424
1.1
525
~~~
626

27+
Released on June 23, 2020
28+
729
Breaking changes:
830

931
* Drop support for Python 3.3. (#358)
@@ -22,7 +44,6 @@ Other changes:
2244
``html5lib`` keeps working in future Python versions. (#403)
2345
* Drop optional ``datrie`` dependency. (#442)
2446

25-
2647
1.0.1
2748
~~~~~
2849

@@ -95,7 +116,7 @@ Released on July 14, 2016
95116
tested, doesn't entirely work, and as far as I can tell is
96117
completely unused by anyone.**
97118

98-
* Move testsuite to ``py.test``.
119+
* Move testsuite to ``pytest``.
99120

100121
* **Fix #124: move to webencodings for decoding the input byte stream;
101122
this makes html5lib compliant with the Encoding Standard, and

‎CONTRIBUTING.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ documentation. Some useful information:
1616
- We keep the master branch passing all tests at all times on all
1717
supported versions.
1818

19-
`Travis CI <https://travis-ci.org/html5lib/html5lib-python/>`_ is run
19+
`GitHub Actions <https://github.com/html5lib/html5lib-python/actions>`_ is run
2020
against all pull requests and should enforce all of the above.
2121

2222
We use `Opera Critic <https://critic.hoppipolla.co.uk/>`_ as an external

‎README.rst

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
html5lib
22
========
33

4-
.. image:: https://travis-ci.org/html5lib/html5lib-python.svg?branch=master
5-
:target: https://travis-ci.org/html5lib/html5lib-python
6-
4+
.. image:: https://github.com/html5lib/html5lib-python/actions/workflows/python-tox.yml/badge.svg
5+
:target: https://github.com/html5lib/html5lib-python/actions/workflows/python-tox.yml
76

87
html5lib is a pure-python library for parsing HTML. It is designed to
98
conform to the WHATWG HTML specification, as is implemented by all major
@@ -128,7 +127,7 @@ Tests
128127
-----
129128

130129
Unit tests require the ``pytest`` and ``mock`` libraries and can be
131-
run using the ``py.test`` command in the root directory.
130+
run using the ``pytest`` command in the root directory.
132131

133132
Test data are contained in a separate `html5lib-tests
134133
<https://github.com/html5lib/html5lib-tests>`_ repository and included
@@ -145,7 +144,9 @@ which can be found on PyPI.
145144
Questions?
146145
----------
147146

148-
There's a mailing list available for support on Google Groups,
149-
`html5lib-discuss <http://groups.google.com/group/html5lib-discuss>`_,
150-
though you may get a quicker response asking on IRC in `#whatwg on
151-
irc.freenode.net <http://wiki.whatwg.org/wiki/IRC>`_.
147+
Check out `the docs <https://html5lib.readthedocs.io/en/latest/>`_. Still
148+
need help? Go to our `GitHub Discussions
149+
<https://github.com/html5lib/html5lib-python/discussions>`_.
150+
151+
You can also browse the archives of the `html5lib-discuss mailing list
152+
<https://www.mail-archive.com/[email protected]/>`_.

‎doc/conf.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
# Add any Sphinx extension module names here, as strings. They can be extensions
2121
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
22-
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.viewcode']
22+
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.viewcode',
23+
'sphinx.ext.intersphinx']
2324

2425
# Add any paths that contain templates here, relative to this directory.
2526
templates_path = ['_templates']
@@ -92,6 +93,13 @@
9293
]
9394

9495

96+
intersphinx_mapping = {
97+
'python': ('https://docs.python.org/3/', None),
98+
'lxml': ('https://lxml.de/apidoc/', None),
99+
'chardet': ('https://chardet.readthedocs.io/en/latest/', None),
100+
}
101+
102+
95103
class CExtMock(object):
96104
"""Required for autodoc on readthedocs.org where you cannot build C extensions."""
97105
def __init__(self, *args, **kwargs):

‎doc/html5lib.filters.rst

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,61 @@
11
filters Package
22
===============
33

4-
:mod:`base` Module
5-
-------------------
4+
``base`` Module
5+
----------------
66

77
.. automodule:: html5lib.filters.base
88
:members:
99
:show-inheritance:
1010
:special-members: __init__
1111

12-
:mod:`alphabeticalattributes` Module
13-
------------------------------------
12+
.. autoclass:: html5lib.filters.base.Filter
13+
:members:
14+
:show-inheritance:
15+
:special-members: __init__
16+
17+
``alphabeticalattributes`` Module
18+
---------------------------------
1419

1520
.. automodule:: html5lib.filters.alphabeticalattributes
1621
:members:
1722
:show-inheritance:
1823
:special-members: __init__
1924

20-
:mod:`inject_meta_charset` Module
21-
---------------------------------
25+
``inject_meta_charset`` Module
26+
------------------------------
2227

2328
.. automodule:: html5lib.filters.inject_meta_charset
2429
:members:
2530
:show-inheritance:
2631
:special-members: __init__
2732

28-
:mod:`lint` Module
29-
------------------
33+
``lint`` Module
34+
---------------
3035

3136
.. automodule:: html5lib.filters.lint
3237
:members:
3338
:show-inheritance:
3439
:special-members: __init__
3540

36-
:mod:`optionaltags` Module
37-
--------------------------
41+
``optionaltags`` Module
42+
-----------------------
3843

3944
.. automodule:: html5lib.filters.optionaltags
4045
:members:
4146
:show-inheritance:
4247
:special-members: __init__
4348

44-
:mod:`sanitizer` Module
45-
-----------------------
49+
``sanitizer`` Module
50+
--------------------
4651

4752
.. automodule:: html5lib.filters.sanitizer
4853
:members:
4954
:show-inheritance:
5055
:special-members: __init__
5156

52-
:mod:`whitespace` Module
53-
------------------------
57+
``whitespace`` Module
58+
---------------------
5459

5560
.. automodule:: html5lib.filters.whitespace
5661
:members:

‎doc/html5lib.rst

+11-6
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,34 @@ html5lib Package
44
.. automodule:: html5lib
55
:members: __version__
66

7-
:mod:`constants` Module
8-
-----------------------
7+
``constants`` Module
8+
--------------------
99

1010
.. automodule:: html5lib.constants
1111
:members:
1212
:show-inheritance:
1313

14-
:mod:`html5parser` Module
15-
-------------------------
14+
``html5parser`` Module
15+
----------------------
1616

1717
.. automodule:: html5lib.html5parser
1818
:members:
1919
:show-inheritance:
2020
:special-members: __init__
2121

22-
:mod:`serializer` Module
23-
------------------------
22+
``serializer`` Module
23+
---------------------
2424

2525
.. automodule:: html5lib.serializer
2626
:members:
2727
:show-inheritance:
2828
:special-members: __init__
2929

30+
.. autoclass:: html5lib.serializer.HTMLSerializer
31+
:members:
32+
:show-inheritance:
33+
:special-members: __init__
34+
3035
Subpackages
3136
-----------
3237

‎doc/html5lib.treeadapters.rst

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
treeadapters Package
22
====================
33

4-
:mod:`~html5lib.treeadapters` Package
5-
-------------------------------------
6-
74
.. automodule:: html5lib.treeadapters
85
:members:
96
:show-inheritance:

0 commit comments

Comments
 (0)