- This documentation applies to xml2rfc version 3.19.0.¶
+ This documentation applies to xml2rfc version 3.19.1.¶
@@ -6366,7 +6366,7 @@
The following variables are available for use in an xml2rfc
- manpage Jinja2 template, as of xml2rfc version 3.19.0:¶
+ manpage Jinja2 template, as of xml2rfc version 3.19.1:¶
{{ bare_latin_tags }}:
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
index bbf5ffac..4ff2be7b 100644
--- a/tests/valid/draft-miek-test.html
+++ b/tests/valid/draft-miek-test.html
@@ -16,7 +16,7 @@
This version is adapted to work with "xml2rfc" version 2.x.
' name="description">
-
+
@@ -26,12 +26,12 @@
+
+
@@ -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 11 July 2024.
+ This Internet-Draft will expire on 19 July 2024.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
index 86c065c4..c2189857 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft January 8, 2024
+Internet-Draft January 16, 2024
Intended status: Experimental
-Expires: July 11, 2024
+Expires: July 19, 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 July 11, 2024.
+ This Internet-Draft will expire on July 19, 2024.
Copyright Notice
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index 6d5f71c6..fa1bfeeb 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -6,7 +6,7 @@
xml2rfc index tests
-
+
@@ -23,7 +23,7 @@
Person
-
Expires July 11, 2024
+
Expires July 19, 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 July 11, 2024.¶
+ This Internet-Draft will expire on July 19, 2024.¶
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
index 7814dc59..38149b92 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,10 +1,10 @@
xml2rfc(1) xml2rfc(1)
- 8 January 2024
+ 16 January 2024
Xml2rfc Vocabulary Version 3 Schema
- xml2rfc release 3.19.0
- xml2rfc-docs-3.19.0
+ xml2rfc release 3.19.1
+ xml2rfc-docs-3.19.1
Abstract
@@ -54,7 +54,7 @@ Table of Contents
The latest version of this documentation is available in HTML form at
https://ietf-tools.github.io/xml2rfc/.
- This documentation applies to xml2rfc version 3.19.0.
+ This documentation applies to xml2rfc version 3.19.1.
2. Schema Version 3 Elements
@@ -4319,7 +4319,7 @@ Appendix C. xml2rfc Configuration Files
Appendix D. xml2rfc Documentation Template Variables
The following variables are available for use in an xml2rfc manpage
- Jinja2 template, as of xml2rfc version 3.19.0:
+ Jinja2 template, as of xml2rfc version 3.19.1:
{{ bare_latin_tags }}:
diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
index 578a4cfd..324ec220 100644
--- a/tests/valid/rfc7911.html
+++ b/tests/valid/rfc7911.html
@@ -16,15 +16,15 @@
that each path is identified by a Path Identifier in addition to the
address prefix.
" name="description">
-
+
+
+
@@ -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 11 July 2024.
+ This Internet-Draft will expire on 19 July 2024.
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
index 1aee8a53..efad953f 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
Network Working Group H. Person, Ed.
-Internet-Draft January 8, 2024
+Internet-Draft January 16, 2024
Intended status: Experimental
-Expires: July 11, 2024
+Expires: July 19, 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 July 11, 2024.
+ This Internet-Draft will expire on July 19, 2024.
Copyright Notice
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 0df7de7c..293396a0 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -6,7 +6,7 @@
xml2rfc sourcecode tests
-
+
@@ -23,7 +23,7 @@
Person
-
Expires July 11, 2024
+
Expires July 19, 2024
[Page]
@@ -36,12 +36,12 @@
sourcecode-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 July 11, 2024.¶
+ This Internet-Draft will expire on July 19, 2024.¶
diff --git a/xml2rfc/__init__.py b/xml2rfc/__init__.py
index 4bca8641..07b3a3fe 100644
--- a/xml2rfc/__init__.py
+++ b/xml2rfc/__init__.py
@@ -46,25 +46,16 @@
def get_versions():
import sys
versions = []
- extras = set(['weasyprint'])
try:
- import pkg_resources
- this = pkg_resources.working_set.by_key[NAME]
- for p in this.requires():
- if p.key in extras:
- extras -= p.key
+ from importlib import metadata
+ this = metadata.distribution(NAME)
+ for p in [x.split()[0] for x in this.requires]:
try:
- dist = pkg_resources.get_distribution(p.key)
- versions.append((dist.project_name, dist.version))
+ dist = metadata.distribution(p)
+ versions.append((dist.metadata['name'], dist.metadata['version']))
except Exception as e:
print(e)
pass
- for key in extras:
- try:
- dist = pkg_resources.get_distribution(key)
- versions.append((dist.project_name, dist.version))
- except:
- pass
except:
pass