Merge pull request #168 from davidhewitt/tidy-html-py-ever

html-py-ever: tidy ups for tests and CI

Author: davidhewitt

.github/workflows/ci.yml

@@ -26,20 +26,20 @@ jobs:
     strategy:
       fail-fast: false  # If one platform fails, allow the rest to keep testing.
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
         platform: [
           { os: "macos-latest",   python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
           { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
           { os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
           { os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
         ]
         exclude:
-          # No 64-bit pypy on windows
-          - python-version: pypy3
+          # No 64-bit pypy 3.6 on Windows
+          - python-version: pypy-3.6
             platform: { os: "windows-latest", python-architecture: "x64" }
-          # Example rust_with_cffi broken on Python 3.5 for Windows, never mind!
-          - python-version: 3.5
-            platform: { os: "windows-latest" }
+          # No 32-bit pypy 3.7 on Windows
+          - python-version: pypy-3.7
+            platform: { os: "windows-latest", python-architecture: "x86" }
 
     steps:
       - uses: actions/checkout@v2
@@ -65,11 +65,14 @@ jobs:
       - name: Install test dependencies
         run: pip install --upgrade tox setuptools
 
+      - name: Install wheel (workaround python 3.10 CI issue)
+        if: matrix.python-version == '3.10-dev'
+        run: pip install --upgrade wheel
+
       - name: Build package
         run: pip install -e .
 
       - name: Test examples
-        if: matrix.python-version != 'pypy3'
         shell: bash
         env:
           PYTHON: ${{ matrix.python-version }}
@@ -78,20 +81,6 @@ jobs:
               tox -c $example_dir -e py
           done
 
-      - name: Test examples (pypy)
-        # FIXME: issues with tox + pypy + windows
-        if: matrix.python-version == 'pypy3' && matrix.platform.os != 'windows-latest'
-        shell: bash
-        run: |
-          for example_dir in examples/*; do
-              if [[ $example_dir = "examples/html-py-ever" ]]; then
-              echo "skipping html-py-ever on pypy3 - lxml is hard to build from source"
-              continue
-              fi
-
-              tox -c $example_dir -e py
-          done
-
       - name: Test macOS universal2
         if: matrix.platform.os == 'macos-latest'
         shell: bash

README.md

@@ -77,7 +77,7 @@ Processing dependencies for hello_rust==1.0
 Finished processing dependencies for hello_rust==1.0
 ```
 
-Or you can use commands like ``bdist_wheel`` (after installing ``wheel``). See also [the notes in the documentation about building wheels](https://setuptools-rust.readthedocs.io/en/latest/building_wheels.html).
+Or you can use commands like `bdist_wheel` (after installing `wheel`). See also [the notes in the documentation about building wheels](https://setuptools-rust.readthedocs.io/en/latest/building_wheels.html).
 
 By default, `develop` will create a debug build, while `install` will create a release build.
 

examples/html-py-ever/README.md

@@ -0,0 +1,26 @@
+[metadata]
+name = html-py-ever
+version = 0.1.0
+license = MIT
+url = https://github.com/PyO3/setuptools-rust/blob/main/examples/html-py-ever
+long_description = file: README.md
+long_description_content_type = text/markdown
+classifiers =
+    License :: OSI Approved :: MIT License
+    Intended Audience :: Developers
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Development Status :: 5 - Production/Stable
+    Operating System :: POSIX
+    Operating System :: MacOS :: MacOS X
+    Operating System :: Microsoft :: Windows
+
+[options]
+packages = html_py_ever
+zip_safe = False
+setup_requires = setuptools-rust >= 0.12.1;
+python_requires = >=3.6
+include_package_data = True

examples/html-py-ever/setup.cfg

@@ -2,25 +2,9 @@
 import sys
 
 from setuptools import setup
+
 from setuptools_rust import RustExtension
 
 setup(
-    name="html-py-ever",
-    version="0.1.0",
-    classifiers=[
-        "License :: OSI Approved :: MIT License",
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Rust",
-        "Operating System :: POSIX",
-        "Operating System :: MacOS :: MacOS X",
-    ],
-    packages=["html_py_ever"],
-    install_requires=["beautifulsoup4", "lxml"],
     rust_extensions=[RustExtension("html_py_ever.html_py_ever")],
-    include_package_data=True,
-    zip_safe=False,
 )

examples/html-py-ever/setup.py

@@ -1,11 +1,19 @@
 #!/usr/bin/env python3
+import os
 from glob import glob
 from time import perf_counter
 from typing import Tuple
 
 import html_py_ever
 from bs4 import BeautifulSoup
 
+try:
+    import lxml
+
+    HAVE_LXML = True
+except ImportError:
+    HAVE_LXML = False
+
 
 def rust(filename: str) -> Tuple[int, float, float]:
     start_load = perf_counter()
@@ -34,23 +42,20 @@ def python(filename: str, parser: str) -> Tuple[int, float, float]:
 
 
 def main():
-    for filename in glob("*.html"):
+    files_glob = os.path.abspath(os.path.join(os.path.dirname(__file__), "*.html"))
+    for filename in glob(files_glob):
         count_rs, parse_rs, select_rs = rust(filename)
-        count_lxml, parse_lxml, select_lxml = python(filename, "lxml")
         count_py, parse_py, select_py = python(filename, "html.parser")
-        assert count_rs == count_lxml
         assert count_rs == count_py
-        print(f"{filename} {count_rs}")
-        print(
-            f"Parse lxml  {parse_rs:6f}s {parse_lxml:6f}s {parse_lxml/parse_rs:6.3f}x"
-        )
-        print(f"Parse py    {parse_rs:6f}s {parse_py:6f}s {parse_py/parse_rs:6.3f}x")
-        print(
-            f"Select lxml {select_lxml:6f}s {select_rs:6f}s {select_lxml/select_rs:6.3f}x"
-        )
-        print(
-            f"Select py   {select_py:6f}s {select_rs:6f}s {select_py/select_rs:6.3f}x"
-        )
+        print(f"{filename} {count_rs} {parse_rs:6f}s")
+        print(f"Parse py    {parse_py:6f}s {parse_py/parse_rs:6.3f}x")
+        print(f"Select py   {select_py:6f}s {select_py/select_rs:6.3f}x")
+
+        if HAVE_LXML:
+            count_lxml, parse_lxml, select_lxml = python(filename, "lxml")
+            assert count_rs == count_lxml
+            print(f"Parse lxml  {parse_lxml:6f}s {parse_lxml/parse_rs:6.3f}x")
+            print(f"Select lxml {select_lxml:6f}s {select_lxml/select_rs:6.3f}x")
 
 
 if __name__ == "__main__":

examples/html-py-ever/test/run_all.py

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