From 5003bae4ca8aab95091e75f366f466e89926e6e8 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 16 Aug 2020 07:03:07 -0400 Subject: Remove dependency on six from packaging. --- pavement.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pavement.py') diff --git a/pavement.py b/pavement.py index b5220d10..34603ed1 100644 --- a/pavement.py +++ b/pavement.py @@ -22,7 +22,11 @@ def rewrite_packaging(pkg_files, new_root): """ for file in pkg_files.glob('*.py'): text = file.text() - text = re.sub(r' (pyparsing|six)', rf' {new_root}.\1', text) + text = re.sub(r' (pyparsing)', rf' {new_root}.\1', text) + text = text.replace( + 'from six.moves.urllib import parse', + 'from urllib import parse', + ) file.write_text(text) -- cgit v1.2.1 From 45e0ea0ff10a64f315a5c65b6805327222e5b565 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 16 Aug 2020 07:09:10 -0400 Subject: Remove six as a vendored dependency. --- pavement.py | 1 + 1 file changed, 1 insertion(+) (limited to 'pavement.py') diff --git a/pavement.py b/pavement.py index 34603ed1..81ff6f12 100644 --- a/pavement.py +++ b/pavement.py @@ -54,6 +54,7 @@ def install(vendor): subprocess.check_call(install_args) remove_all(vendor.glob('*.dist-info')) remove_all(vendor.glob('*.egg-info')) + remove_all(vendor.glob('six.py')) (vendor / '__init__.py').write_text('') -- cgit v1.2.1