From d4a4172ded22db3c9374b0d45143e987101be318 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 30 Jan 2024 12:02:05 +0100 Subject: [PATCH 1/3] Fix current linkcheck failures Both work in principle, but the link checker runs into an SSL error for the first, and fails to resolve the second link pointing to an eventual build artifact. This change ignores both types of URLs. SSL error should be retried after a bit of time. --- docs/conf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index 09cafed2c..ae80e0d4a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -180,6 +180,10 @@ 'https://twitter.com/datalad', # maybe a user-agent issue? github.com/sphinx-doc/sphinx//issues/10343 'https://github.com/datalad/datalad-extension-template/generate', + # (temporary?) SSL certificate error + 'https://fcon_1000.projects.nitrc.org/*', + # local link fails to resolve, maybe because its a build artifact? + '../_images/intro-v1-cover.jpg', ] # Add any paths that contain templates here, relative to this directory. From b068f7439d7cde7e0acf4f5b4ed9ad63fb2fd797 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 30 Jan 2024 12:07:46 +0100 Subject: [PATCH 2/3] Remove Jinja2 version pinning It was introduced in response to https://github.com/datalad-handbook/book/issues/821, but the underlying issue seems resolved (no import error during linkcheck). An upgrade is necessary because of a vulnerability report in Jinja2, which was patched in version 3.1.3. Vulnerability report: https://github.com/datalad-handbook/book/security/dependabot/1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1118f77d6..c37ddd54e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ chardet docutils idna imagesize -Jinja2 < 3.1 +Jinja2 MarkupSafe packaging Pygments From 1b9fd861ead3df310f70f3e9be7be8c5665ff6c7 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 30 Jan 2024 12:13:43 +0100 Subject: [PATCH 3/3] CI: add missing dependency as reported on appveyor Error message reads: Unpacking singularity-ce (4.1.0-focal) ... dpkg: dependency problems prevent configuration of singularity-ce: singularity-ce depends on fuse2fs; however: Package fuse2fs is not installed. dpkg: error processing package singularity-ce (--install): --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d8e2e2af1..d282fd4e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ shallow_clone: false environment: DTS: datalad_next APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - INSTALL_SYSPKGS: graphicsmagick-imagemagick-compat moreutils jq uidmap + INSTALL_SYSPKGS: graphicsmagick-imagemagick-compat moreutils jq uidmap fuse2fs # go with whatever is most recent to catch anything that might break # with them INSTALL_GITANNEX: git-annex -m snapshot