From 6e90d68a0d06b4f898ad794b88a7915edc2d046c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 5 Oct 2021 09:32:59 -0400
Subject: [PATCH] Remove one level of nesting in the docs directory hierarchy
---
.gitlab-ci.yml | 3 +--
docs/{build => _static}/.gitignore | 0
docs/{source => }/_static/logo-ps.svg | 0
docs/{source/_static => _templates}/.gitignore | 0
docs/{source => }/conf.py | 0
docs/{source => }/dev/README.rst | 0
docs/docs.nix | 2 +-
docs/{source => }/index.rst | 0
docs/{source => }/ops/README.rst | 0
docs/{source => }/ops/generating-keys.rst | 0
docs/{source => }/ops/monitoring.rst | 0
docs/{source => }/ops/service-dag-to-dashboard-order.dot | 0
docs/source/_templates/.gitignore | 1 -
13 files changed, 2 insertions(+), 4 deletions(-)
rename docs/{build => _static}/.gitignore (100%)
rename docs/{source => }/_static/logo-ps.svg (100%)
rename docs/{source/_static => _templates}/.gitignore (100%)
rename docs/{source => }/conf.py (100%)
rename docs/{source => }/dev/README.rst (100%)
rename docs/{source => }/index.rst (100%)
rename docs/{source => }/ops/README.rst (100%)
rename docs/{source => }/ops/generating-keys.rst (100%)
rename docs/{source => }/ops/monitoring.rst (100%)
rename docs/{source => }/ops/service-dag-to-dashboard-order.dot (100%)
delete mode 100644 docs/source/_templates/.gitignore
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ef000d0..c367e3bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,9 @@ docs:
stage: "build"
script:
- "nix-build docs"
- - "cp --recursive --no-preserve=mode result/docs/. docs/build/"
artifacts:
paths:
- - "docs/build/"
+ - "./result/docs/"
expose_as: "documentation"
unit-tests:
diff --git a/docs/build/.gitignore b/docs/_static/.gitignore
similarity index 100%
rename from docs/build/.gitignore
rename to docs/_static/.gitignore
diff --git a/docs/source/_static/logo-ps.svg b/docs/_static/logo-ps.svg
similarity index 100%
rename from docs/source/_static/logo-ps.svg
rename to docs/_static/logo-ps.svg
diff --git a/docs/source/_static/.gitignore b/docs/_templates/.gitignore
similarity index 100%
rename from docs/source/_static/.gitignore
rename to docs/_templates/.gitignore
diff --git a/docs/source/conf.py b/docs/conf.py
similarity index 100%
rename from docs/source/conf.py
rename to docs/conf.py
diff --git a/docs/source/dev/README.rst b/docs/dev/README.rst
similarity index 100%
rename from docs/source/dev/README.rst
rename to docs/dev/README.rst
diff --git a/docs/docs.nix b/docs/docs.nix
index 03ac07df..d764aa78 100644
--- a/docs/docs.nix
+++ b/docs/docs.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
- ${pyenv}/bin/sphinx-build -W docs/source $out/docs
+ ${pyenv}/bin/sphinx-build -W docs/ $out/docs
'';
}
diff --git a/docs/source/index.rst b/docs/index.rst
similarity index 100%
rename from docs/source/index.rst
rename to docs/index.rst
diff --git a/docs/source/ops/README.rst b/docs/ops/README.rst
similarity index 100%
rename from docs/source/ops/README.rst
rename to docs/ops/README.rst
diff --git a/docs/source/ops/generating-keys.rst b/docs/ops/generating-keys.rst
similarity index 100%
rename from docs/source/ops/generating-keys.rst
rename to docs/ops/generating-keys.rst
diff --git a/docs/source/ops/monitoring.rst b/docs/ops/monitoring.rst
similarity index 100%
rename from docs/source/ops/monitoring.rst
rename to docs/ops/monitoring.rst
diff --git a/docs/source/ops/service-dag-to-dashboard-order.dot b/docs/ops/service-dag-to-dashboard-order.dot
similarity index 100%
rename from docs/source/ops/service-dag-to-dashboard-order.dot
rename to docs/ops/service-dag-to-dashboard-order.dot
diff --git a/docs/source/_templates/.gitignore b/docs/source/_templates/.gitignore
deleted file mode 100644
index f935021a..00000000
--- a/docs/source/_templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
--
GitLab