From ee0b95cd215461dc12c8657bc19f10bf6892f6e7 Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Fri, 31 Jan 2025 16:12:14 +0100
Subject: [PATCH] sphinx/conf.py: Fix redirection declarations with
sphinx-reredirects
Source to redirect must be a docname and redirect link must be relative
to the redirected document.
This also reverts commit dbc52f9db0cbac30ca66b0f9cfbecd2ea827c222 as
those files are no longer needed.
---
docs/.gitignore | 1 -
docs/devel/swh-dataset/export.rst | 3 --
.../devel/swh-dataset/generate_subdataset.rst | 3 --
docs/devel/swh-dataset/graph/athena.rst | 4 ---
docs/devel/swh-dataset/graph/dataset.rst | 3 --
docs/devel/swh-dataset/graph/schema.rst | 3 --
docs/devel/swh-dataset/index.rst | 3 --
swh/docs/sphinx/conf.py | 33 ++++++++++---------
8 files changed, 17 insertions(+), 36 deletions(-)
delete mode 100644 docs/devel/swh-dataset/export.rst
delete mode 100644 docs/devel/swh-dataset/generate_subdataset.rst
delete mode 100644 docs/devel/swh-dataset/graph/athena.rst
delete mode 100644 docs/devel/swh-dataset/graph/dataset.rst
delete mode 100644 docs/devel/swh-dataset/graph/schema.rst
delete mode 100644 docs/devel/swh-dataset/index.rst
diff --git a/docs/.gitignore b/docs/.gitignore
index 9be90d0d..ff321326 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,7 +1,6 @@
*-stamp
_build/
devel/swh-*
-!devel/swh-dataset
errors.log
!/swh-loader.rst
sources/
diff --git a/docs/devel/swh-dataset/export.rst b/docs/devel/swh-dataset/export.rst
deleted file mode 100644
index bc7cd9c1..00000000
--- a/docs/devel/swh-dataset/export.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:orphan:
-
-This page was moved to: :ref:`swh-graph-export`.
diff --git a/docs/devel/swh-dataset/generate_subdataset.rst b/docs/devel/swh-dataset/generate_subdataset.rst
deleted file mode 100644
index 637edd25..00000000
--- a/docs/devel/swh-dataset/generate_subdataset.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:orphan:
-
-This page was moved to: :ref:`swh-graph-export-subdataset`.
diff --git a/docs/devel/swh-dataset/graph/athena.rst b/docs/devel/swh-dataset/graph/athena.rst
deleted file mode 100644
index 87f690f0..00000000
--- a/docs/devel/swh-dataset/graph/athena.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-:orphan:
-
-This page was moved to: :ref:`swh-graph-athena`.
-
diff --git a/docs/devel/swh-dataset/graph/dataset.rst b/docs/devel/swh-dataset/graph/dataset.rst
deleted file mode 100644
index e5c5e115..00000000
--- a/docs/devel/swh-dataset/graph/dataset.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:orphan:
-
-This page was moved to: :ref:`swh-export-list`.
diff --git a/docs/devel/swh-dataset/graph/schema.rst b/docs/devel/swh-dataset/graph/schema.rst
deleted file mode 100644
index 145205d3..00000000
--- a/docs/devel/swh-dataset/graph/schema.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:orphan:
-
-This page was moved to: :ref:`swh-export-schema`.
diff --git a/docs/devel/swh-dataset/index.rst b/docs/devel/swh-dataset/index.rst
deleted file mode 100644
index dc22e5a1..00000000
--- a/docs/devel/swh-dataset/index.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:orphan:
-
-This page was moved to: :ref:`swh-export`.
diff --git a/swh/docs/sphinx/conf.py b/swh/docs/sphinx/conf.py
index 9f9da874..932a7e30 100644
--- a/swh/docs/sphinx/conf.py
+++ b/swh/docs/sphinx/conf.py
@@ -210,26 +210,27 @@ intersphinx_mapping = {
# Redirects for pages that were moved, so we don't break external links.
# Uses sphinx-reredirects
redirects = {
- "swh-deposit/spec-api": "api/api-documentation.html",
- "swh-deposit/metadata": "api/metadata.html",
- "swh-deposit/specs/blueprint": "../api/use-cases.html",
- "swh-deposit/user-manual": "api/user-manual.html",
- "swh-dataset/index.html": "swh-export/index.html",
- "swh-dataset/graph/dataset.html": "swh-export/graph/dataset.html",
- "swh-dataset/graph/schema.html": "swh-export/graph/schema.html",
- "swh-dataset/graph/athena.html": "swh-export/graph/athena.html",
- "swh-dataset/export.html": "swh-export/export.html",
- "swh-dataset/generate_subdataset.html": "swh-export/generate_subdataset.html",
- "apidoc/swh.dataset.html": "apidoc/swh.export.html",
- "infrastructure/index.html": "../../sysadm/network-architecture/index.html",
- "infrastructure/network.html": "../../sysadm/network-architecture/index.html",
- "infrastructure/service-urls.html": "../../sysadm/network-architecture/service-urls.html", # noqa
- "architecture": "architecture/overview.html",
+ "devel/swh-deposit/spec-api": "api/api-documentation.html",
+ "devel/swh-deposit/metadata": "api/metadata.html",
+ "devel/swh-deposit/specs/blueprint": "../api/use-cases.html",
+ "devel/swh-deposit/user-manual": "api/user-manual.html",
+ "devel/swh-dataset/index": "../swh-export/index.html",
+ "devel/swh-dataset/graph/dataset": "../../swh-export/graph/dataset.html",
+ "devel/swh-dataset/graph/schema": "../../swh-export/graph/schema.html",
+ "devel/swh-dataset/graph/athena": "../../swh-export/graph/athena.html",
+ "devel/swh-dataset/graph/databricks": "../../swh-export/graph/databricks.html",
+ "devel/swh-dataset/export": "../swh-export/export.html",
+ "devel/swh-dataset/generate_subdataset": "../swh-export/generate_subdataset.html",
+ "devel/apidoc/swh.dataset": "swh.export.html",
+ "infrastructure/index": "../sysadm/network-architecture/index.html",
+ "infrastructure/network": "../sysadm/network-architecture/index.html",
+ "infrastructure/service-urls": "../sysadm/network-architecture/service-urls.html", # noqa
+ "architecture": "devel/architecture/overview.html",
"architecture/mirror": "../../sysadm/mirror-operations/index.html",
"keycloak": "../../sysadm/user-management/keycloak/index.html",
"mirror": "architecture/mirror.html",
"users": "user",
- "swh-web/uri-scheme-identifiers": "uri-scheme-swhids.html",
+ "devel/swh-web/uri-scheme-identifiers": "uri-scheme-swhids.html",
}
--
GitLab