Fix html-py-ever in CI

Author: davidhewitt

.github/workflows/ci.yml

@@ -23,11 +23,6 @@ jobs:
           toolchain: stable
           override: true
 
-      # Install dependencies on ubuntu
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install build dependencies
-        run: sudo apt-get install -y libxml2-dev libxslt-dev
-
       # Install 32-bit windows target for pypy3
       - if: matrix.os == 'windows-latest' && matrix.python-version == 'pypy3'
         name: Install 32-bit Rust target
@@ -48,15 +43,18 @@ jobs:
           cd example_tomlgen
           python setup.py tomlgen_rust -w build
 
-      # FIXME: Can't test easily on windows 3.9 or pypy because have to build lxml from source!
+      # Install lxml build dependencies on ubuntu for pypy
+      - if: matrix.os == 'ubuntu-latest' && matrix.python-version == 'pypy3'
+        name: Install lxml build dependencies
+        run: sudo apt-get install -y libxml2-dev libxslt-dev
+
+      # Can't test easily on windows pypy because have to build lxml from source!
       - name: Test html-py-ever
-        if: ${{ !(matrix.os == 'windows-latest' && (matrix.python-version == 'pypy3' || matrix.python-version == '3.9-dev')) }}
+        if: ${{ !(matrix.os == 'windows-latest' && matrix.python-version == 'pypy3') }}
         shell: bash
         run: |
-          cd html-py-ever
-          pip install -r requirements-dev.txt
-          python setup.py install
-          cd test && pytest
+          pip install tox
+          tox -c html-py-ever -e py
 
       - name: Test other examples
         shell: bash

html-py-ever/MANIFEST.in

@@ -0,0 +1,2 @@
+include Cargo.toml
+recursive-include src *

html-py-ever/README.md

@@ -8,7 +8,7 @@ Demoing hot to use [html5ever](https://github.com/servo/html5ever) through [kuch
 
 ## Benchmarking
 
-Create a python 3.6+ venv and activate it. Install html-py-ever in there (`python setup.py install`). To get a readable benchmark, run `test/run_all.py`. To get a real benchmark, run `pytest test_parsing.py` or `pytest test_selector.py`. Both have a `--benchmark-histogram` option.
+Run `tox -e py`.
 
 ## Example benchmark results
 

html-py-ever/pyproject.toml

@@ -2,21 +2,7 @@
 import sys
 
 from setuptools import setup
-
-try:
-    from setuptools_rust import RustExtension
-except ImportError:
-    import subprocess
-
-    errno = subprocess.call([sys.executable, "-m", "pip", "install", "setuptools-rust"])
-    if errno:
-        print("Please install setuptools-rust package")
-        raise SystemExit(errno)
-    else:
-        from setuptools_rust import RustExtension
-
-setup_requires = ["setuptools-rust>=0.10.1", "wheel"]
-install_requires = []
+from setuptools_rust import RustExtension
 
 setup(
     name="html-py-ever",
@@ -31,9 +17,11 @@
         "Operating System :: MacOS :: MacOS X",
     ],
     packages=["html_py_ever"],
+    install_requires=[
+        "beautifulsoup4",
+        "lxml"
+    ],
     rust_extensions=[RustExtension("html_py_ever.html_py_ever")],
-    install_requires=install_requires,
-    setup_requires=setup_requires,
     include_package_data=True,
     zip_safe=False,
 )

html-py-ever/requirements-dev.txt

@@ -1,12 +1,16 @@
 #!/usr/bin/env python
 from glob import glob
+import os
 
 import html_py_ever
 import pytest
 from bs4 import BeautifulSoup
 from html_py_ever import Document
 
 
+HTML_FILES = glob(os.path.join(os.path.dirname(__file__), "*.html"))
+
+
 def rust(filename: str) -> Document:
     return html_py_ever.parse_file(filename)
 
@@ -18,11 +22,11 @@ def python(filename: str) -> BeautifulSoup:
     return soup
 
 
-@pytest.mark.parametrize("filename", list(glob("*.html")))
+@pytest.mark.parametrize("filename", HTML_FILES)
 def test_bench_parsing_rust(benchmark, filename):
     benchmark(rust, filename)
 
 
-@pytest.mark.parametrize("filename", list(glob("*.html")))
+@pytest.mark.parametrize("filename", HTML_FILES)
 def test_bench_parsing_python(benchmark, filename):
     benchmark(python, filename)

html-py-ever/setup.py

@@ -1,18 +1,22 @@
 #!/usr/bin/env python
 from glob import glob
+import os
 
 import html_py_ever
 import pytest
 from bs4 import BeautifulSoup
 
 
-@pytest.mark.parametrize("filename", list(glob("*.html")))
+HTML_FILES = glob(os.path.join(os.path.dirname(__file__), "*.html"))
+
+
+@pytest.mark.parametrize("filename", HTML_FILES)
 def test_bench_selector_rust(benchmark, filename):
     document = html_py_ever.parse_file(filename)
     benchmark(document.select, "a[href]")
 
 
-@pytest.mark.parametrize("filename", list(glob("*.html")))
+@pytest.mark.parametrize("filename", HTML_FILES)
 def test_bench_selector_python(benchmark, filename):
     with open(filename, encoding='utf8') as fp:
         soup = BeautifulSoup(fp, "html.parser")

html-py-ever/test/test_parsing.py

@@ -0,0 +1,11 @@
+[tox]
+requires =
+    setuptools-rust @ file://{toxinidir}/../
+
+[testenv]
+description = Run the unit tests under {basepython}
+deps =
+    setuptools-rust @ file://{toxinidir}/../
+    pytest-benchmark[historgram]
+    pytest>=3.6
+commands = pytest {posargs}