Merge branch 'ietf-tools:main' into docs/xml2rfc-fonts

ietf-tools · Oct 2, 2023 · d13b4a6 · d13b4a6
2 parents 699962b + ff2ceff
commit d13b4a6
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 56 deletions.
diff --git 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/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v3.18.1] - 2023-09-29
+### :bug: Bug Fixes
+- [`02253d8`](https://github.com/ietf-tools/xml2rfc/commit/02253d8c7dbd8c3bcf2a7d60ae7dc0c71c78d73d) - **text**: Preserve NBSP in dd *(PR [#1023](https://github.com/ietf-tools/xml2rfc/pull/1023) by [@kesara](https://github.com/kesara))*
+  - :arrow_lower_right: *fixes issue [#1022](undefined) opened by [@d3e3e3](https://github.com/d3e3e3)*
+- [`0704155`](https://github.com/ietf-tools/xml2rfc/commit/070415586f37914b5bbe7a1379f33f2c9ff00258) - **v2v3**: Preserve t element in ol and li  *(PR [#972](https://github.com/ietf-tools/xml2rfc/pull/972) by [@kesara](https://github.com/kesara))*
+  - :arrow_lower_right: *fixes issue [#850](undefined) opened by [@cabo](https://github.com/cabo)*
+- [`c10a50c`](https://github.com/ietf-tools/xml2rfc/commit/c10a50c427f8b4002d51f020e506dd2c317e615a) - Make block quotes symmetric *(PR [#1027](https://github.com/ietf-tools/xml2rfc/pull/1027) by [@kesara](https://github.com/kesara))*
+  - :arrow_lower_right: *fixes issue [#1018](undefined) opened by [@cabo](https://github.com/cabo)*
+- [`9ea862c`](https://github.com/ietf-tools/xml2rfc/commit/9ea862cae29ed2c4f750ca82cb6c01c42d9cb094) - Render child elements in the xref element *(PR [#1036](https://github.com/ietf-tools/xml2rfc/pull/1036) by [@kesara](https://github.com/kesara))*
+  - :arrow_lower_right: *fixes issue [#1034](undefined) opened by [@cabo](https://github.com/cabo)*
+
+### :memo: Documentation Changes
+- [`31059d5`](https://github.com/ietf-tools/xml2rfc/commit/31059d5adbdb36c9407e63535208e6c51af1ff94) - update CHANGELOG.md + py file versions for v3.18.0 [skip ci] *(commit by [@kesara](https://github.com/kesara))*
+
+### :wrench: Chores
+- [`b6bdd70`](https://github.com/ietf-tools/xml2rfc/commit/b6bdd700fe9e62de7682847a288e3eed63900737) - Restrict WeasyPrint versions *(PR [#1038](https://github.com/ietf-tools/xml2rfc/pull/1038) by [@kesara](https://github.com/kesara))*
+- [`4f52a7b`](https://github.com/ietf-tools/xml2rfc/commit/4f52a7b552086db144092a311a64f1abbad3eacf) - Allow WeasyPrint v60.1 *(PR [#1040](https://github.com/ietf-tools/xml2rfc/pull/1040) by [@kesara](https://github.com/kesara))*
+
+
 ## [v3.18.0] - 2023-08-04
 ### :sparkles: New Features
 - [`46aecfb`](https://github.com/ietf-tools/xml2rfc/commit/46aecfb64d3ef678c17e85f8d7b9de362a7ee07b) - Allow Unicode characters everywhere  *(PR [#1017](https://github.com/ietf-tools/xml2rfc/pull/1017) by [@kesara](https://github.com/kesara))*
@@ -2060,4 +2079,5 @@ This release fixes all outstanding major bugs, details below. The issue tracker
 [v3.17.3]: https://github.com/ietf-tools/xml2rfc/compare/v3.17.2...v3.17.3
 [v3.17.4]: https://github.com/ietf-tools/xml2rfc/compare/v3.17.3...v3.17.4
 [v3.17.5]: https://github.com/ietf-tools/xml2rfc/compare/v3.17.4...v3.17.5
-[v3.18.0]: https://github.com/ietf-tools/xml2rfc/compare/v3.17.5...v3.18.0
+[v3.18.0]: https://github.com/ietf-tools/xml2rfc/compare/v3.17.5...v3.18.0
+[v3.18.1]: https://github.com/ietf-tools/xml2rfc/compare/v3.18.0...v3.18.1
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
@@ -55,7 +55,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
@@ -1,6 +1,6 @@
 [metadata]
 name = xml2rfc
-version = 3.18.0
+version = 3.18.1
 description = xml2rfc generates RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies.
 long_description = file:  README.md
 long_description_content_type = text/markdown
@@ -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
@@ -27,7 +27,7 @@
 <meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
 <!-- Generator version information:
   xml2rfc 3.18.0
-    Python 3.10.6
+    Python 3.10.12
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
@@ -37,10 +37,10 @@
     pycountry 22.3.5
     PyYAML 6.0.1
     requests 2.31.0
-    setuptools 67.4.0
+    setuptools 68.2.0
     six 1.16.0
-    wcwidth 0.2.6
-    weasyprint 59.0
+    wcwidth 0.2.7
+    weasyprint 60.1
 -->
 <link href="tests/input/draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">

diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
@@ -16,7 +16,7 @@
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <!-- Generator version information:
   xml2rfc 3.18.0
-    Python 3.10.6
+    Python 3.10.12
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
@@ -26,10 +26,10 @@
     pycountry 22.3.5
     PyYAML 6.0.1
     requests 2.31.0
-    setuptools 67.4.0
+    setuptools 68.2.0
     six 1.16.0
-    wcwidth 0.2.6
-    weasyprint 59.0
+    wcwidth 0.2.7
+    weasyprint 60.1
 -->
 <link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">

diff --git 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
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2023-09-27T02:01:34" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2023-09-29T09:36:20" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.18.0 -->
 
 
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="27" month="09" year="2023"/>
+    <date day="29" month="09" year="2023"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 30 March 2024.
+        This Internet-Draft will expire on 1 April 2024.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">

diff --git 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
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires March 30, 2024</td>
+<td class="center">Expires April 1, 2024</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">indexes-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2023-09-27" class="published">September 27, 2023</time>
+<time datetime="2023-09-29" class="published">September 29, 2023</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2024-03-30">March 30, 2024</time></dd>
+<dd class="expires"><time datetime="2024-04-01">April 1, 2024</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-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."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on March 30, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on April 1, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">

diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
@@ -1,5 +1,5 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                       27 September 2023
+                                                       29 September 2023
 
 
                   Xml2rfc Vocabulary Version 3 Schema

diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
@@ -20,7 +20,7 @@
 <meta content="7911" name="rfc.number">
 <!-- Generator version information:
   xml2rfc 3.18.0
-    Python 3.10.6
+    Python 3.10.12
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
     intervaltree 3.1.0
@@ -30,10 +30,10 @@
     pycountry 22.3.5
     PyYAML 6.0.1
     requests 2.31.0
-    setuptools 67.4.0
+    setuptools 68.2.0
     six 1.16.0
-    wcwidth 0.2.6
-    weasyprint 59.0
+    wcwidth 0.2.7
+    weasyprint 60.1
 -->
 <link href="tests/input/rfc7911.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">

diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.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 sourcecode 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 sourcecode tests          September 2023
 
@@ -109,7 +109,7 @@ Internet-Draft          xml2rfc sourcecode tests          September 2023
 
 
 
-Person                   Expires March 30, 2024                 [Page 2]
+Person                    Expires April 1, 2024                 [Page 2]
 
 Internet-Draft          xml2rfc sourcecode tests          September 2023
 
@@ -165,7 +165,7 @@ Internet-Draft          xml2rfc sourcecode tests          September 2023
 
 
 
-Person                   Expires March 30, 2024                 [Page 3]
+Person                    Expires April 1, 2024                 [Page 3]
 
 Internet-Draft          xml2rfc sourcecode tests          September 2023
 
@@ -221,4 +221,4 @@ Author's Address
 
 
 
-Person                   Expires March 30, 2024                 [Page 4]
+Person                    Expires April 1, 2024                 [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2023-09-27T02:01:42" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2023-09-29T09:36:28" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.18.0 -->
 
 
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="27" month="09" year="2023"/>
+    <date day="29" month="09" year="2023"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 30 March 2024.
+        This Internet-Draft will expire on 1 April 2024.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">

diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.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 sourcecode 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