modernize, drop old python, upgrade lxml by kylegibson-rldatix · Pull Request #24 · PolicyStat/htmltreediff

kylegibson-rldatix · 2026-06-29T21:41:01Z

Most of the changes are converting from nose tests to pytests: assert_equal to assert, and test generation (yield) to parameterize

Copilot

Pull request overview

This PR modernizes the project by dropping legacy Python/nose-era tooling, migrating test execution to pytest, upgrading core dependencies (notably lxml), and moving CI from Travis/tox to GitHub Actions.

Changes:

Replace nose-based testing/coverage with pytest + pytest-cov and update tests accordingly.
Remove Python 3.7-era compatibility (e.g., six usage) and set python_requires=">=3.8".
Replace Travis/tox/pylint configuration with a GitHub Actions CI workflow and a standalone .flake8.

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
tox.ini	Removed legacy tox configuration.
setup.py	Simplified setuptools import, added `python_requires>=3.8`, updated classifiers.
run_tests.sh	Switched test runner from `nosetests` to `pytest` and kept flake8 linting.
requirements/testing.txt	Replaced nose/coverage with pytest/pytest-cov.
requirements/default.txt	Updated html5lib/lxml requirements and removed `six`.
pylintrc	Removed legacy pylint configuration.
pylint.sh	Removed legacy pylint runner script.
htmltreediff/util.py	Removed `six` usage; simplified string conversion.
htmltreediff/text.py	Removed `six` usage; adjusted docstring and regex compilation typing check.
htmltreediff/tests.py	Updated assertions as part of migrating away from nose tools.
htmltreediff/test_xml.py	Replaced nose assertions with plain `assert`.
htmltreediff/test_text.py	Converted generator-style tests to pytest parametrization.
htmltreediff/test_html.py	Converted generator-style tests to pytest parametrization and plain asserts.
htmltreediff/test_diff_core.py	Replaced nose assertions with plain `assert` patterns.
htmltreediff/test_cli.py	Removed `six.StringIO` and nose assertions; used stdlib `io.StringIO`.
htmltreediff/diff_core.py	Removed `six` and updated string type checks.
.travis.yml	Removed Travis CI configuration.
.github/workflows/ci.yml	Added GitHub Actions CI for tests across 3.8–3.12 and linting on 3.12.
.flake8	Added flake8 configuration previously embedded in tox config.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 6 comments.

Copilot

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 1 comment.

kylegibson-rldatix · 2026-06-30T15:51:16Z

mostly copied from htmltreediff/test_text.py that shows up as deleted, with some changes/refactor to change from nose-style generated tests to pytest parametrize

Copilot

Pull request overview

Copilot reviewed 24 out of 25 changed files in this pull request and generated 2 comments.

kylegibson-rldatix · 2026-06-30T15:52:06Z

 )


+def assert_html_equal(a_html, b_html):


copied from test_core

kylegibson-rldatix · 2026-06-30T15:52:24Z

        yield case
-
-
-def test_node_compare():


moved to test_test_util

kylegibson-rldatix · 2026-06-30T15:56:48Z

This is not actually a new file. It's moved from htmltreediff/test_html.py, but then has a lot of refactors/changes for a few reasons: dropping old python, and switching from nose test generations to pytest's parametrize

A duplicate test case removed (LI changes markup internalization fix not done if next tag is not an insert)

Other than that, the tests remain functionally the same as before

kylegibson-rldatix · 2026-06-30T16:00:21Z

@@ -1,3 +1 @@
-html5lib==0.90


html5lib was effectively dropped in #1, but the requirement was not removed from this file.

…11 and 3.12

… GitHub Actions is slow and has missing dependencies, so we use a prebuilt wheel

kylegibson-rldatix · 2026-06-30T17:29:55Z

@@ -1,3 +1 @@
-html5lib==0.90
-lxml==4.2.5
-six==1.15.0


No longer supporting py2 so six is not needed

Copilot

Pull request overview

Copilot reviewed 24 out of 27 changed files in this pull request and generated no new comments.

kylegibson-rldatix · 2026-06-30T17:37:52Z

#27 will drop support for 4.2.5

bobcribbs-rldatix · 2026-06-30T17:51:48Z

@@ -0,0 +1,3 @@
+[flake8]


im curious if you consideered going to pyproject.toml?

i know it adds an extra dependency for flake8 to have it read pyproject.toml ...

that's why, because it can't read pyproject natively

bobcribbs-rldatix · 2026-06-30T17:57:56Z


 def multi_split(text, regexes):
-    """
+    r"""


im curious why the r for this comment.

raw string so \w is handled correctly

jenblake-rldatix · 2026-06-30T18:24:12Z

-            )
-        test.description = 'test_html_patch - %s' % case.name
-        yield test
+@pytest.mark.parametrize('case', list(parse_cases(all_test_cases)), ids=lambda c: c.name)


This is cool - I've never used mark.parametrize

parameterize is literally the best part of pytest. I love it.

jenblake-rldatix · 2026-06-30T19:06:02Z

@@ -1,3 +0,0 @@
-#! /bin/sh


You should update the README.md file 'cause it talks about using this

jenblake-rldatix

👍 Looks good

kylegibson-rldatix self-assigned this Jun 29, 2026

kylegibson-rldatix added 12 commits June 29, 2026 15:38

Refs #24. No longer used

c27b34a

Refs #24. Initial flake8 config

0439d2e

Refs #24. Initial GHA workflow for tests

45972c0

Refs #24. Upgrade and use sha refs

befe7b8

Refs #24. Initial attempt at modernizing

b330bc1

Refs #24. Upgrade and use sha refs

d87f604

Refs #24. Drop to 92 since we don''t have full coverage right now

c9522f9

Refs #24. Update for pytest

2fa8753

Refs #24. Use raw string

acd16d0

Refs #24. Stop installing flake8 for the test env

9f310f8

Refs #24. Stop running lint for each python version

3fc3732

Refs #24. Fix some flake8 issues

b45ae97

kylegibson-rldatix requested a review from Copilot June 29, 2026 23:11

Copilot started reviewing on behalf of kylegibson-rldatix June 29, 2026 23:12 View session

Copilot AI reviewed Jun 29, 2026

View reviewed changes

Comment thread requirements/testing.txt

Comment thread htmltreediff/tests.py

Comment thread htmltreediff/tests.py Outdated

Comment thread run_tests.sh Outdated

Comment thread run_tests.sh Outdated

Comment thread requirements/default.txt Outdated

kylegibson-rldatix added 6 commits June 29, 2026 19:35

Refs #24. Rename so pytest can find it

60810ac

Refs #24. Better formatting

d526c3a

Refs #24. Refactor, update for pytest

2872792

Refs #24. Updated coverage minimum to 99

cbcc594

Refs #24. Move to pyproject

2e9ee12

Refs #24. Pin requirements

6b6453b

kylegibson-rldatix requested a review from Copilot June 30, 2026 00:08

Copilot started reviewing on behalf of kylegibson-rldatix June 30, 2026 00:08 View session

Copilot AI reviewed Jun 30, 2026

View reviewed changes

Refs #24. Improve case generation

613edf0

kylegibson-rldatix requested a review from Copilot June 30, 2026 01:10

Copilot started reviewing on behalf of kylegibson-rldatix June 30, 2026 01:10 View session

Copilot AI reviewed Jun 30, 2026

View reviewed changes

Comment thread htmltreediff/test_html.py Outdated

Refs #24. Fix a 16 year old bad test

4fec3dd

kylegibson-rldatix added 2 commits June 30, 2026 11:42

Refs #24. html5lib isn't actually used anymore

b3cba3f

Refs #24. Drop push, pull_request is enough

e7229c4

kylegibson-rldatix requested a review from Copilot June 30, 2026 15:47

Copilot started reviewing on behalf of kylegibson-rldatix June 30, 2026 15:48 View session

kylegibson-rldatix commented Jun 30, 2026

View reviewed changes

Copilot AI reviewed Jun 30, 2026

View reviewed changes

Comment thread .github/workflows/ci.yml

Comment thread .github/workflows/ci.yml

kylegibson-rldatix commented Jun 30, 2026

View reviewed changes

kylegibson-rldatix added 5 commits June 30, 2026 12:53

Refs #24. Set lxml lower bound version

0be29d1

Refs #24. Test each major version of lxml across python 3.8, 3.10, 3.…

1cecf65

…11 and 3.12

Refs #24. Fixed spec def

72c8e0e

Refs #24. Stop hiding wheels

d96e7f7

Refs #24. 4.2.5 support is still required but building from source on…

123480f

… GitHub Actions is slow and has missing dependencies, so we use a prebuilt wheel

kylegibson-rldatix commented Jun 30, 2026

View reviewed changes

kylegibson-rldatix requested a review from Copilot June 30, 2026 17:31

Copilot started reviewing on behalf of kylegibson-rldatix June 30, 2026 17:32 View session

kylegibson-rldatix mentioned this pull request Jun 30, 2026

Increase coverage back to 100 #26

Open

Copilot AI reviewed Jun 30, 2026

View reviewed changes

kylegibson-rldatix commented Jun 30, 2026

View reviewed changes

bobcribbs-rldatix reviewed Jun 30, 2026

View reviewed changes

jenblake-rldatix reviewed Jun 30, 2026

View reviewed changes

kylegibson-rldatix added 2 commits June 30, 2026 15:52

Refs #24. Converted to markdown and removed/updated stale references

99e0edd

Refs #24. Updated readme path

6547505

jenblake-rldatix approved these changes Jun 30, 2026

View reviewed changes

kylegibson-rldatix merged commit bb9e97d into master Jun 30, 2026
15 checks passed

kylegibson-rldatix deleted the issue_24 branch June 30, 2026 20:13

		@@ -1,3 +1 @@
		html5lib==0.90

Uh oh!

Conversation

kylegibson-rldatix commented Jun 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kylegibson-rldatix Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kylegibson-rldatix Jun 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jenblake-rldatix left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

kylegibson-rldatix commented Jun 29, 2026 •

edited

Loading

kylegibson-rldatix Jun 30, 2026 •

edited

Loading

kylegibson-rldatix Jun 30, 2026 •

edited

Loading