Merge branch 'main' into docusaurus-v3

conda-incubator · Dec 14, 2023 · f413fdc · f413fdc
2 parents 2ef4ec5 + d1081c7
commit f413fdc
Show file tree

Hide file tree

Showing 47 changed files with 8 additions and 4,048 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
diff --git a/.gitignore b/.gitignore
@@ -15,9 +15,6 @@ data
 node_modules
 .nuxt
 
-# sphinx
-docs/_build
-
 # nix
 .direnv
 **/.DS_Store

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="./docs/_static/images/conda-store-logo-vertical-lockup.svg" alt="conda-store logo" width="30%">
+  <img src="./docusaurus-docs/community/images/logos/conda-store-logo-vertical-lockup.svg" alt="conda-store logo" width="30%">
   <p>
   Data science environments, for collaboration.
 

diff --git a/conda-store-server/README.md b/conda-store-server/README.md
@@ -1,7 +1,4 @@
 # conda-store server
 
-Check the full documentation at [conda.store](https://conda.store/).
-
-A multi-tenant server for managing Conda environments. See the
-[documentation](https://conda-store.readthedocs.io/en/latest/) for
-more information.
+A multi-tenant server for managing conda environments.
+See the [documentation](https://conda.store/) for more information.
diff --git a/conda-store-server/conda_store_server/server/templates/navigation.html b/conda-store-server/conda_store_server/server/templates/navigation.html
@@ -35,7 +35,7 @@
             </li>
             {% endif %}
             <li>
-                <a class="btn btn-outline-secondary my-2 my-sm-0" href="https://conda-store.readthedocs.io/"
+                <a class="btn btn-outline-secondary my-2 my-sm-0" href="https://conda.store/"
                    target="_blank" role="button">
                     Help
                 </a>

diff --git a/conda-store-server/conda_store_server/server/templates/user.html b/conda-store-server/conda_store_server/server/templates/user.html
@@ -49,7 +49,7 @@ <h5 class="card-title">Namespace</h5>
 <div class="card m-2">
     <div class="card-body">
         <h5 class="card-title">Permissions</h5>
-        <p>Below are your current permissions within the conda-store application. The "*" will match any string of characters e.g. "na*ce" will match "namespace". This allows conda-store to have flexible and powerful authorization. For further information on authorization see the <a href="https://conda-store.readthedocs.io/en/latest/contributing.html#authorization-model">docs</a></p>
+        <p>Below are your current permissions within the conda-store application. The "*" will match any string of characters e.g. "na*ce" will match "namespace". This allows conda-store to have flexible and powerful authorization. For further information on authorization see the <a href="https://conda.store/conda-store/references/auth">docs</a></p>
         <table class="table table-hover">
             <thead>
                 <tr>

diff --git a/conda-store-server/pyproject.toml b/conda-store-server/pyproject.toml
@@ -73,7 +73,6 @@ dependencies = [
 
 [tool.hatch.envs.dev.scripts]
 lint = ["pre-commit run --all"]
-docs = "sphinx-build -b html ../docs ../docs/_build"
 unit-test = "pytest tests -v"
 playwright-test = [
   "playwright install",

diff --git a/conda-store/README.md b/conda-store/README.md
@@ -2,26 +2,8 @@
 
 Check the full documentation at [conda.store](https://conda.store/).
 
-A client library for interacting with a conda-store server. See the
-[documentation](https://conda-store.readthedocs.io/en/latest/) for
-more information. The client library provides a CLI for interacting
-with conda-store.
+A client library which provides a CLI for interacting with conda-store-server.
 
 ```shell
 $ conda-store --help
-Usage: conda-store [OPTIONS] COMMAND [ARGS]...
-
-Options:
-  --conda-store-url TEXT     conda-store base url including prefix
-  --auth [none|token|basic]  conda-store authentication to use
-  --no-verify-ssl            Disable tls verification on API requests
-  --help                     Show this message and exit.
-
-Commands:
-  download  Download artifacts for given build
-  info      Get current permissions and default namespace
-  list
-  run       Execute given environment specified as a URI with COMMAND
-  solve     Remotely solve given environment.yaml
-  wait      Wait for given URI to complete or fail building
 ```
diff --git a/conda-store/pyproject.toml b/conda-store/pyproject.toml
@@ -58,7 +58,6 @@ dependencies = [
 
 [tool.hatch.envs.dev.scripts]
 lint = ["pre-commit run --all"]
-docs = "sphinx-build -b html ../docs ../docs/_build"
 test = "pytest tests"
 
 [project.scripts]

diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
diff --git a/docs/_static/images/conda-store-architecture.png b/docs/_static/images/conda-store-architecture.png
diff --git a/docs/_static/images/conda-store-authenticated.png b/docs/_static/images/conda-store-authenticated.png
diff --git a/docs/_static/images/conda-store-build-complete.png b/docs/_static/images/conda-store-build-complete.png
diff --git a/docs/_static/images/conda-store-create-environment.png b/docs/_static/images/conda-store-create-environment.png
diff --git a/docs/_static/images/conda-store-database-architecture.png b/docs/_static/images/conda-store-database-architecture.png
diff --git a/docs/_static/images/conda-store-entity-relationship-diagram.png b/docs/_static/images/conda-store-entity-relationship-diagram.png
diff --git a/docs/_static/images/conda-store-environment.png b/docs/_static/images/conda-store-environment.png
diff --git a/docs/_static/images/conda-store-installation-kubernetes.png b/docs/_static/images/conda-store-installation-kubernetes.png
diff --git a/docs/_static/images/conda-store-login-jupyterhub-oauth.png b/docs/_static/images/conda-store-login-jupyterhub-oauth.png
diff --git a/docs/_static/images/conda-store-logo-symbol.svg b/docs/_static/images/conda-store-logo-symbol.svg
diff --git a/docs/_static/images/conda-store-logo-vertical-lockup.png b/docs/_static/images/conda-store-logo-vertical-lockup.png
diff --git a/docs/_static/images/conda-store-namespace.png b/docs/_static/images/conda-store-namespace.png
diff --git a/docs/_static/images/conda-store-single-environment.png b/docs/_static/images/conda-store-single-environment.png
diff --git a/docs/_static/images/conda-store-terminology.png b/docs/_static/images/conda-store-terminology.png
diff --git a/docs/_static/images/conda-store-triangle-all.png b/docs/_static/images/conda-store-triangle-all.png
diff --git a/docs/_static/images/conda-store-triangle-it-reproducibility.png b/docs/_static/images/conda-store-triangle-it-reproducibility.png
diff --git a/docs/_static/images/conda-store-triangle-it-users.png b/docs/_static/images/conda-store-triangle-it-users.png
diff --git a/docs/_static/images/conda-store-triangle-users-reproducibility.png b/docs/_static/images/conda-store-triangle-users-reproducibility.png
diff --git a/docs/_static/images/conda-store-ui.webp b/docs/_static/images/conda-store-ui.webp
diff --git a/docs/_static/images/conda-store-unauthenticated.png b/docs/_static/images/conda-store-unauthenticated.png
diff --git a/docs/_static/images/conda-store-user.png b/docs/_static/images/conda-store-user.png
diff --git a/docs/_static/images/favicon.ico b/docs/_static/images/favicon.ico