From 4f52a7b552086db144092a311a64f1abbad3eacf Mon Sep 17 00:00:00 2001 From: Kesara Rathnayake Date: Sat, 30 Sep 2023 10:15:34 +1300 Subject: [PATCH] chore: Allow WeasyPrint v60.1 (#1040) WeasyPrint 60.1 has fixed the crash caused by the wrong UTF-8 indices. Allow installing v60.1 and above while avoiding v60.0. --- .github/workflows/checks.yml | 6 +++--- docker/base.Dockerfile | 2 +- setup.cfg | 2 +- tests/valid/draft-miek-test.html | 8 ++++---- tests/valid/draft-template.html | 8 ++++---- tests/valid/indexes.pages.text | 12 ++++++------ tests/valid/indexes.prepped.xml | 6 +++--- tests/valid/indexes.text | 6 +++--- tests/valid/indexes.v3.html | 8 ++++---- tests/valid/manpage.txt | 2 +- tests/valid/rfc7911.html | 8 ++++---- tests/valid/sourcecode.pages.text | 14 +++++++------- tests/valid/sourcecode.prepped.xml | 6 +++--- tests/valid/sourcecode.text | 6 +++--- tests/valid/sourcecode.v3.html | 8 ++++---- tox.ini | 2 +- xml2rfc/run.py | 2 +- 17 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ba8dd860..d36b2cc7 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -90,7 +90,7 @@ jobs: echo "Installing pip + wheel..." python -m pip install --upgrade pip wheel echo "Installing requirements.txt + test dependencies..." - python -m pip install -r requirements.txt tox tox-gh-actions certifi decorator dict2xml pyflakes "pypdf>=3.2.1" "weasyprint>=53.0,!=57.0,<60.0" + python -m pip install -r requirements.txt tox tox-gh-actions certifi decorator dict2xml pyflakes "pypdf>=3.2.1" "weasyprint>=53.0,!=57.0,!=60.0" - name: Generate Valid Tests run: | @@ -151,7 +151,7 @@ jobs: echo "Installing pip + wheel..." python -m pip install --upgrade pip wheel echo "Installing requirements.txt + test dependencies..." - python -m pip install -r requirements.txt tox tox-gh-actions certifi decorator dict2xml pyflakes "pypdf>=3.2.1" "weasyprint>=53.0,!=57.0,<60.0" + python -m pip install -r requirements.txt tox tox-gh-actions certifi decorator dict2xml pyflakes "pypdf>=3.2.1" "weasyprint>=53.0,!=57.0,!=60.0" - name: Generate Valid Tests run: | @@ -201,7 +201,7 @@ jobs: # echo "Installing pip + wheel..." # python -m pip install --upgrade pip wheel # echo "Installing requirements.txt + test dependencies..." -# python -m pip install -r requirements.txt tox tox-gh-actions certifi decorator dict2xml pyflakes "pypdf>=3.2.1" "weasyprint>=53.0,!=57.0,<60.0" +# python -m pip install -r requirements.txt tox tox-gh-actions certifi decorator dict2xml pyflakes "pypdf>=3.2.1" "weasyprint>=53.0,!=57.0,!=60.0" # - name: Generate Valid Tests # run: | # make yestests || true diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index e9be51c9..78dfaf72 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -59,7 +59,7 @@ RUN pip3 install --upgrade \ # Install Python dependencies RUN pip3 install -r requirements.txt \ - "weasyprint>=53.0,<60.0" \ + "weasyprint>=53.0,!=57.0,!=60.0" \ decorator \ dict2xml \ "pypdf>=3.2.1" diff --git a/setup.cfg b/setup.cfg index d4dca607..0bd30423 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,7 +45,7 @@ console_scripts = xml2rfc = xml2rfc.run:main [options.extras_require] -pdf = weasyprint>=53.0,!=57.0,<60.0 +pdf = weasyprint>=53.0,!=57.0,!=60.0 [bdist_wheel] universal = 1 diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html index 15b29508..433411d6 100644 --- a/tests/valid/draft-miek-test.html +++ b/tests/valid/draft-miek-test.html @@ -27,7 +27,7 @@ diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html index ef3c9ce7..184a2ce6 100644 --- a/tests/valid/draft-template.html +++ b/tests/valid/draft-template.html @@ -16,7 +16,7 @@ diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text index e4316cc1..8f47dad3 100644 --- a/tests/valid/indexes.pages.text +++ b/tests/valid/indexes.pages.text @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft September 27, 2023 +Internet-Draft September 29, 2023 Intended status: Experimental -Expires: March 30, 2024 +Expires: April 1, 2024 xml2rfc index tests @@ -26,7 +26,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on March 30, 2024. + This Internet-Draft will expire on April 1, 2024. Copyright Notice @@ -53,7 +53,7 @@ Table of Contents -Person Expires March 30, 2024 [Page 1] +Person Expires April 1, 2024 [Page 1] Internet-Draft xml2rfc index tests September 2023 @@ -109,7 +109,7 @@ Index -Person Expires March 30, 2024 [Page 2] +Person Expires April 1, 2024 [Page 2] Internet-Draft xml2rfc index tests September 2023 @@ -165,4 +165,4 @@ Author's Address -Person Expires March 30, 2024 [Page 3] +Person Expires April 1, 2024 [Page 3] diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml index 2bcbb07f..d2644a9c 100644 --- a/tests/valid/indexes.prepped.xml +++ b/tests/valid/indexes.prepped.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - +
Status of This Memo @@ -41,7 +41,7 @@ material or to cite them other than as "work in progress." - This Internet-Draft will expire on 30 March 2024. + This Internet-Draft will expire on 1 April 2024.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text index 02ce692f..f962f35b 100644 --- a/tests/valid/indexes.text +++ b/tests/valid/indexes.text @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft September 27, 2023 +Internet-Draft September 29, 2023 Intended status: Experimental -Expires: March 30, 2024 +Expires: April 1, 2024 xml2rfc index tests @@ -26,7 +26,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on March 30, 2024. + This Internet-Draft will expire on April 1, 2024. Copyright Notice diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html index 2ec4646f..c4cd67a5 100644 --- a/tests/valid/indexes.v3.html +++ b/tests/valid/indexes.v3.html @@ -23,7 +23,7 @@ Person -Expires March 30, 2024 +Expires April 1, 2024 [Page] @@ -36,12 +36,12 @@
indexes-00
Published:
- +
Intended Status:
Experimental
Expires:
-
+
Author:
@@ -71,7 +71,7 @@

time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."

- This Internet-Draft will expire on March 30, 2024.

+ This Internet-Draft will expire on April 1, 2024.