From f9765b44bf5749b1bd6e96fbf91a9ae226db7c3d Mon Sep 17 00:00:00 2001 From: Alex Handler Wagner Date: Wed, 23 Mar 2022 21:09:18 -0400 Subject: [PATCH 1/6] closes 386 --- docs/source/impl-guide/computed_identifiers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/impl-guide/computed_identifiers.rst b/docs/source/impl-guide/computed_identifiers.rst index 2fb8662b..3aa7f4ae 100644 --- a/docs/source/impl-guide/computed_identifiers.rst +++ b/docs/source/impl-guide/computed_identifiers.rst @@ -193,7 +193,7 @@ Truncated Digest (sha512t24u) The sha512t24u truncated digest algorithm [Hart2020]_ computes an ASCII digest from binary data. The method uses two well-established standard algorithms, the `SHA-512`_ hash function, which generates a binary -digest from binary data, and `Base64`_ URL encoding, which encodes +digest from binary data, and `base64url`_ encoding, which encodes binary data using printable characters. Computing the sha512t24u truncated digest for binary data consists of From 15c42b88b213c8368ce4d2f2bfea32036077fae1 Mon Sep 17 00:00:00 2001 From: Alex Handler Wagner Date: Thu, 24 Mar 2022 10:47:00 -0400 Subject: [PATCH 2/6] second revision per https://github.com/ga4gh/vrs/pull/387\#issuecomment-1077616351 --- docs/source/impl-guide/computed_identifiers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/impl-guide/computed_identifiers.rst b/docs/source/impl-guide/computed_identifiers.rst index 3aa7f4ae..3e93b2a1 100644 --- a/docs/source/impl-guide/computed_identifiers.rst +++ b/docs/source/impl-guide/computed_identifiers.rst @@ -193,7 +193,7 @@ Truncated Digest (sha512t24u) The sha512t24u truncated digest algorithm [Hart2020]_ computes an ASCII digest from binary data. The method uses two well-established standard algorithms, the `SHA-512`_ hash function, which generates a binary -digest from binary data, and `base64url`_ encoding, which encodes +digest from binary data, and a URL-safe variant of `Base64`_ encoding, which encodes binary data using printable characters. Computing the sha512t24u truncated digest for binary data consists of From 67c47684eb035cd2c3665930bb309018b04b09ff Mon Sep 17 00:00:00 2001 From: Alex Handler Wagner Date: Thu, 24 Mar 2022 10:57:21 -0400 Subject: [PATCH 3/6] add Sphinx version to requirements --- .requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.requirements.txt b/.requirements.txt index eeb24e5e..9f502d15 100644 --- a/.requirements.txt +++ b/.requirements.txt @@ -3,4 +3,5 @@ python-jsonschema-objects>=0.3,<=0.3.10 jsonschema==3.2.0 ipython pyyaml -ga4gh.gks.metaschema>=0.1.1 \ No newline at end of file +ga4gh.gks.metaschema>=0.1.1 +Sphinx==3.5.4 \ No newline at end of file From 9eae6839e73514ffedc6a3b4cc7c4fb110dd6734 Mon Sep 17 00:00:00 2001 From: Alex Handler Wagner Date: Thu, 24 Mar 2022 11:00:28 -0400 Subject: [PATCH 4/6] update python version --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 30994c13..f1c77f45 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,6 +4,6 @@ sphinx: configuration: docs/source/conf.py python: - version: "3.8" + version: "3.9" install: - requirements: docs/source/requirements.txt \ No newline at end of file From 6994599a66e89e294bad619ab29d2ff5c9335c11 Mon Sep 17 00:00:00 2001 From: Alex Handler Wagner Date: Thu, 24 Mar 2022 11:03:43 -0400 Subject: [PATCH 5/6] revert to 3.8 for RTD support --- .readthedocs.yaml | 2 +- .requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f1c77f45..30994c13 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,6 +4,6 @@ sphinx: configuration: docs/source/conf.py python: - version: "3.9" + version: "3.8" install: - requirements: docs/source/requirements.txt \ No newline at end of file diff --git a/.requirements.txt b/.requirements.txt index 9f502d15..65e0c4fb 100644 --- a/.requirements.txt +++ b/.requirements.txt @@ -4,4 +4,4 @@ jsonschema==3.2.0 ipython pyyaml ga4gh.gks.metaschema>=0.1.1 -Sphinx==3.5.4 \ No newline at end of file +sphinx ~= 3.5 \ No newline at end of file From 0b0c8807ecbffcfc45c1d5c2fc94cf379455b18c Mon Sep 17 00:00:00 2001 From: Alex Handler Wagner Date: Thu, 24 Mar 2022 11:14:35 -0400 Subject: [PATCH 6/6] I think jinja2 broke stuff for RTD, fixing version --- docs/source/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt index ea95d523..01d3cb96 100644 --- a/docs/source/requirements.txt +++ b/docs/source/requirements.txt @@ -1 +1,2 @@ -sphinx ~= 3.5 \ No newline at end of file +sphinx ~= 3.5 +jinja2 == 3.0.3 \ No newline at end of file