regro · sbillinge · Jul 18, 2025 · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025
diff --git a/.flake8 b/.flake8
@@ -6,7 +6,7 @@ exclude =
     __pycache__,
     build,
     dist,
-    doc/source/conf.py
+    docs/source/conf.py
 max-line-length = 115
 # Ignore some style 'errors' produced while formatting by 'black'
 # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings

diff --git a/.gitignore b/.gitignore
@@ -93,4 +93,4 @@ target/
 .ipynb_checkpoints
 
 # Auto sphinx docs
-doc/source/collections/
+docs/source/collections/
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -10,4 +10,4 @@ python:
     - requirements: requirements/docs.txt
 
 sphinx:
-  configuration: doc/source/conf.py
+  configuration: docs/source/conf.py
diff --git a/doc/Makefile → docs/Makefile b/doc/Makefile → docs/Makefile
diff --git a/doc/make.bat → docs/make.bat b/doc/make.bat → docs/make.bat
@@ -1,36 +1,36 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-set SPHINXPROJ=PackagingScientificPython
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+set SPHINXPROJ=PackagingScientificPython
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd
diff --git a/doc/source/Makefile → docs/source/Makefile b/doc/source/Makefile → docs/source/Makefile
diff --git a/doc/source/_static/.placeholder → docs/source/_static/.placeholder b/doc/source/_static/.placeholder → docs/source/_static/.placeholder
diff --git a/doc/source/_static/cv.png → docs/source/_static/cv.png b/doc/source/_static/cv.png → docs/source/_static/cv.png
diff --git a/doc/source/_static/regolith-logo-white.png → docs/source/_static/regolith-logo-white.png b/doc/source/_static/regolith-logo-white.png → docs/source/_static/regolith-logo-white.png
diff --git a/doc/source/_static/regolith-logo-white.svg → docs/source/_static/regolith-logo-white.svg b/doc/source/_static/regolith-logo-white.svg → docs/source/_static/regolith-logo-white.svg
diff --git a/doc/source/_static/regolith-logo.ico → docs/source/_static/regolith-logo.ico b/doc/source/_static/regolith-logo.ico → docs/source/_static/regolith-logo.ico
diff --git a/doc/source/_static/regolith-logo.png → docs/source/_static/regolith-logo.png b/doc/source/_static/regolith-logo.png → docs/source/_static/regolith-logo.png
diff --git a/doc/source/_static/regolith-logo.svg → docs/source/_static/regolith-logo.svg b/doc/source/_static/regolith-logo.svg → docs/source/_static/regolith-logo.svg
diff --git a/doc/source/_static/rg-dungeon.js → docs/source/_static/rg-dungeon.js b/doc/source/_static/rg-dungeon.js → docs/source/_static/rg-dungeon.js
diff --git a/doc/source/_static/unicodetiles.css → docs/source/_static/unicodetiles.css b/doc/source/_static/unicodetiles.css → docs/source/_static/unicodetiles.css
diff --git a/doc/source/_static/unicodetiles.min.js → docs/source/_static/unicodetiles.min.js b/doc/source/_static/unicodetiles.min.js → docs/source/_static/unicodetiles.min.js
diff --git a/...themes/blackcloud/static/blackcloud.css_t → ...themes/blackcloud/static/blackcloud.css_t b/...themes/blackcloud/static/blackcloud.css_t → ...themes/blackcloud/static/blackcloud.css_t
diff --git a/doc/source/_themes/blackcloud/theme.conf → docs/source/_themes/blackcloud/theme.conf b/doc/source/_themes/blackcloud/theme.conf → docs/source/_themes/blackcloud/theme.conf
diff --git a/doc/source/api/regolith.builders.rst → docs/source/api/regolith.builders.rst b/doc/source/api/regolith.builders.rst → docs/source/api/regolith.builders.rst
diff --git a/doc/source/api/regolith.helpers.rst → docs/source/api/regolith.helpers.rst b/doc/source/api/regolith.helpers.rst → docs/source/api/regolith.helpers.rst
diff --git a/doc/source/api/regolith.rst → docs/source/api/regolith.rst b/doc/source/api/regolith.rst → docs/source/api/regolith.rst
diff --git a/doc/source/api/regolith.static.img.rst → docs/source/api/regolith.static.img.rst b/doc/source/api/regolith.static.img.rst → docs/source/api/regolith.static.img.rst
diff --git a/doc/source/api/regolith.static.rst → docs/source/api/regolith.static.rst b/doc/source/api/regolith.static.rst → docs/source/api/regolith.static.rst
diff --git a/doc/source/api/regolith.templates.rst → docs/source/api/regolith.templates.rst b/doc/source/api/regolith.templates.rst → docs/source/api/regolith.templates.rst
diff --git a/doc/source/collections/abstracts.rst → docs/source/collections/abstracts.rst b/doc/source/collections/abstracts.rst → docs/source/collections/abstracts.rst
diff --git a/doc/source/collections/assignments.rst → docs/source/collections/assignments.rst b/doc/source/collections/assignments.rst → docs/source/collections/assignments.rst
diff --git a/doc/source/collections/beamplan.rst → docs/source/collections/beamplan.rst b/doc/source/collections/beamplan.rst → docs/source/collections/beamplan.rst
diff --git a/doc/source/collections/blog.rst → docs/source/collections/blog.rst b/doc/source/collections/blog.rst → docs/source/collections/blog.rst
diff --git a/doc/source/collections/citations.rst → docs/source/collections/citations.rst b/doc/source/collections/citations.rst → docs/source/collections/citations.rst
diff --git a/doc/source/collections/contacts.rst → docs/source/collections/contacts.rst b/doc/source/collections/contacts.rst → docs/source/collections/contacts.rst
diff --git a/doc/source/collections/courses.rst → docs/source/collections/courses.rst b/doc/source/collections/courses.rst → docs/source/collections/courses.rst
diff --git a/doc/source/collections/expenses.rst → docs/source/collections/expenses.rst b/doc/source/collections/expenses.rst → docs/source/collections/expenses.rst
diff --git a/doc/source/collections/formalletters.rst → docs/source/collections/formalletters.rst b/doc/source/collections/formalletters.rst → docs/source/collections/formalletters.rst
diff --git a/doc/source/collections/grades.rst → docs/source/collections/grades.rst b/doc/source/collections/grades.rst → docs/source/collections/grades.rst
diff --git a/doc/source/collections/grants.rst → docs/source/collections/grants.rst b/doc/source/collections/grants.rst → docs/source/collections/grants.rst
diff --git a/doc/source/collections/groups.rst → docs/source/collections/groups.rst b/doc/source/collections/groups.rst → docs/source/collections/groups.rst
diff --git a/doc/source/collections/index.rst → docs/source/collections/index.rst b/doc/source/collections/index.rst → docs/source/collections/index.rst
diff --git a/doc/source/collections/institutions.rst → docs/source/collections/institutions.rst b/doc/source/collections/institutions.rst → docs/source/collections/institutions.rst
diff --git a/doc/source/collections/jobs.rst → docs/source/collections/jobs.rst b/doc/source/collections/jobs.rst → docs/source/collections/jobs.rst
diff --git a/doc/source/collections/meetings.rst → docs/source/collections/meetings.rst b/doc/source/collections/meetings.rst → docs/source/collections/meetings.rst
diff --git a/doc/source/collections/news.rst → docs/source/collections/news.rst b/doc/source/collections/news.rst → docs/source/collections/news.rst
diff --git a/doc/source/collections/people.rst → docs/source/collections/people.rst b/doc/source/collections/people.rst → docs/source/collections/people.rst
diff --git a/doc/source/collections/presentations.rst → docs/source/collections/presentations.rst b/doc/source/collections/presentations.rst → docs/source/collections/presentations.rst
diff --git a/doc/source/collections/projecta.rst → docs/source/collections/projecta.rst b/doc/source/collections/projecta.rst → docs/source/collections/projecta.rst
diff --git a/doc/source/collections/projects.rst → docs/source/collections/projects.rst b/doc/source/collections/projects.rst → docs/source/collections/projects.rst
diff --git a/doc/source/collections/proposalReviews.rst → docs/source/collections/proposalReviews.rst b/doc/source/collections/proposalReviews.rst → docs/source/collections/proposalReviews.rst
diff --git a/doc/source/collections/proposals.rst → docs/source/collections/proposals.rst b/doc/source/collections/proposals.rst → docs/source/collections/proposals.rst
diff --git a/doc/source/collections/reading_lists.rst → docs/source/collections/reading_lists.rst b/doc/source/collections/reading_lists.rst → docs/source/collections/reading_lists.rst
diff --git a/doc/source/collections/refereeReports.rst → docs/source/collections/refereeReports.rst b/doc/source/collections/refereeReports.rst → docs/source/collections/refereeReports.rst
diff --git a/doc/source/collections/software.rst → docs/source/collections/software.rst b/doc/source/collections/software.rst → docs/source/collections/software.rst
diff --git a/doc/source/collections/students.rst → docs/source/collections/students.rst b/doc/source/collections/students.rst → docs/source/collections/students.rst
diff --git a/doc/source/collections/todos.rst → docs/source/collections/todos.rst b/doc/source/collections/todos.rst → docs/source/collections/todos.rst
diff --git a/doc/source/commands/add.rst → docs/source/commands/add.rst b/doc/source/commands/add.rst → docs/source/commands/add.rst
diff --git a/doc/source/commands/app.rst → docs/source/commands/app.rst b/doc/source/commands/app.rst → docs/source/commands/app.rst
diff --git a/doc/source/commands/build.rst → docs/source/commands/build.rst b/doc/source/commands/build.rst → docs/source/commands/build.rst
diff --git a/doc/source/commands/classlist.rst → docs/source/commands/classlist.rst b/doc/source/commands/classlist.rst → docs/source/commands/classlist.rst
diff --git a/doc/source/commands/deploy.rst → docs/source/commands/deploy.rst b/doc/source/commands/deploy.rst → docs/source/commands/deploy.rst
diff --git a/doc/source/commands/email.rst → docs/source/commands/email.rst b/doc/source/commands/email.rst → docs/source/commands/email.rst
diff --git a/doc/source/commands/fs-to-mongo.rst → docs/source/commands/fs-to-mongo.rst b/doc/source/commands/fs-to-mongo.rst → docs/source/commands/fs-to-mongo.rst
diff --git a/doc/source/commands/grade.rst → docs/source/commands/grade.rst b/doc/source/commands/grade.rst → docs/source/commands/grade.rst
diff --git a/doc/source/commands/helper.rst → docs/source/commands/helper.rst b/doc/source/commands/helper.rst → docs/source/commands/helper.rst
diff --git a/doc/source/commands/index.html → docs/source/commands/index.html b/doc/source/commands/index.html → docs/source/commands/index.html
@@ -394,7 +394,7 @@ <h1 class="title">Regolith Commands</h1>
     </span>validate<span class="whitespace">            </span>Validates<span class="whitespace"> </span>db
 </pre>
 <div class="system-message">
-<p class="system-message-title">System Message: ERROR/3 (<tt class="docutils">/Users/huarundong/dbs/regolith/doc/source/commands/index.rst</tt>, line 38)</p>
+<p class="system-message-title">System Message: ERROR/3 (<tt class="docutils">/Users/huarundong/dbs/regolith/docs/source/commands/index.rst</tt>, line 38)</p>
 <p>Unknown directive type &quot;toctree&quot;.</p>
 <pre class="literal-block">
 .. toctree::

diff --git a/doc/source/commands/index.rst → docs/source/commands/index.rst b/doc/source/commands/index.rst → docs/source/commands/index.rst
diff --git a/doc/source/commands/ingest.rst → docs/source/commands/ingest.rst b/doc/source/commands/ingest.rst → docs/source/commands/ingest.rst
diff --git a/doc/source/commands/json-to-yaml.rst → docs/source/commands/json-to-yaml.rst b/doc/source/commands/json-to-yaml.rst → docs/source/commands/json-to-yaml.rst
diff --git a/doc/source/commands/mongo-to-fs.rst → docs/source/commands/mongo-to-fs.rst b/doc/source/commands/mongo-to-fs.rst → docs/source/commands/mongo-to-fs.rst
diff --git a/doc/source/commands/rc.rst → docs/source/commands/rc.rst b/doc/source/commands/rc.rst → docs/source/commands/rc.rst
diff --git a/doc/source/commands/store.rst → docs/source/commands/store.rst b/doc/source/commands/store.rst → docs/source/commands/store.rst
diff --git a/doc/source/commands/validate.rst → docs/source/commands/validate.rst b/doc/source/commands/validate.rst → docs/source/commands/validate.rst
diff --git a/doc/source/commands/yaml-to-json.rst → docs/source/commands/yaml-to-json.rst b/doc/source/commands/yaml-to-json.rst → docs/source/commands/yaml-to-json.rst
diff --git a/doc/source/conf.py → docs/source/conf.py b/doc/source/conf.py → docs/source/conf.py
@@ -14,7 +14,6 @@
 # serve to show the default.
 
 import json
-import os
 import sys
 import tempfile
 import time
@@ -154,7 +153,7 @@
     "github_user": "regro",
     "github_repo": "regolith",
     "github_version": "main",
-    "conf_py_path": "/doc/source/",
+    "conf_py_path": "/docs/source/",
 }
 
 # Theme options are theme-specific and customize the look and feel of a theme

diff --git a/doc/source/database_maintenance/index.rst → docs/source/database_maintenance/index.rst b/doc/source/database_maintenance/index.rst → docs/source/database_maintenance/index.rst
diff --git a/...atabase_maintenance/mongo_maintenance.rst → ...atabase_maintenance/mongo_maintenance.rst b/...atabase_maintenance/mongo_maintenance.rst → ...atabase_maintenance/mongo_maintenance.rst
diff --git a/...per_notes/dp_regolith_prums_to_mongodb.md → ...per_notes/dp_regolith_prums_to_mongodb.md b/...per_notes/dp_regolith_prums_to_mongodb.md → ...per_notes/dp_regolith_prums_to_mongodb.md
diff --git a/doc/source/helper_gui.rst → docs/source/helper_gui.rst b/doc/source/helper_gui.rst → docs/source/helper_gui.rst
diff --git a/doc/source/helper_gui_images/a_projectum.png → .../source/helper_gui_images/a_projectum.png b/doc/source/helper_gui_images/a_projectum.png → .../source/helper_gui_images/a_projectum.png
diff --git a/doc/source/helper_gui_images/l_members.png → docs/source/helper_gui_images/l_members.png b/doc/source/helper_gui_images/l_members.png → docs/source/helper_gui_images/l_members.png
diff --git a/doc/source/helper_gui_images/layout.png → docs/source/helper_gui_images/layout.png b/doc/source/helper_gui_images/layout.png → docs/source/helper_gui_images/layout.png
diff --git a/doc/source/helper_gui_images/u_logurl.png → docs/source/helper_gui_images/u_logurl.png b/doc/source/helper_gui_images/u_logurl.png → docs/source/helper_gui_images/u_logurl.png
diff --git a/doc/source/helper_gui_images/workflow1.png → docs/source/helper_gui_images/workflow1.png b/doc/source/helper_gui_images/workflow1.png → docs/source/helper_gui_images/workflow1.png
diff --git a/doc/source/helper_gui_images/workflow10.png → docs/source/helper_gui_images/workflow10.png b/doc/source/helper_gui_images/workflow10.png → docs/source/helper_gui_images/workflow10.png
diff --git a/doc/source/helper_gui_images/workflow12.png → docs/source/helper_gui_images/workflow12.png b/doc/source/helper_gui_images/workflow12.png → docs/source/helper_gui_images/workflow12.png
diff --git a/doc/source/helper_gui_images/workflow3.png → docs/source/helper_gui_images/workflow3.png b/doc/source/helper_gui_images/workflow3.png → docs/source/helper_gui_images/workflow3.png
diff --git a/doc/source/helper_gui_images/workflow6.png → docs/source/helper_gui_images/workflow6.png b/doc/source/helper_gui_images/workflow6.png → docs/source/helper_gui_images/workflow6.png
diff --git a/doc/source/helper_gui_images/workflow8.png → docs/source/helper_gui_images/workflow8.png b/doc/source/helper_gui_images/workflow8.png → docs/source/helper_gui_images/workflow8.png
diff --git a/doc/source/index.rst → docs/source/index.rst b/doc/source/index.rst → docs/source/index.rst
diff --git a/doc/source/license.rst → docs/source/license.rst b/doc/source/license.rst → docs/source/license.rst
diff --git a/doc/source/make.bat → docs/source/make.bat b/doc/source/make.bat → docs/source/make.bat
diff --git a/doc/source/rc.rst → docs/source/rc.rst b/doc/source/rc.rst → docs/source/rc.rst
diff --git a/doc/source/regolithrc.json → docs/source/regolithrc.json b/doc/source/regolithrc.json → docs/source/regolithrc.json
diff --git a/doc/source/release.rst → docs/source/release.rst b/doc/source/release.rst → docs/source/release.rst
diff --git a/doc/source/tutorials/broker.rst → docs/source/tutorials/broker.rst b/doc/source/tutorials/broker.rst → docs/source/tutorials/broker.rst
diff --git a/doc/source/tutorials/index.rst → docs/source/tutorials/index.rst b/doc/source/tutorials/index.rst → docs/source/tutorials/index.rst
diff --git a/news/talks-schema.rst b/news/talks-schema.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Added presenter and talk_id to the presentations schema
+
+**Security:**
+
+* <news item>
diff --git a/requirements/test.txt → requirements/tests.txt b/requirements/test.txt → requirements/tests.txt
diff --git a/src/regolith/exemplars.json b/src/regolith/exemplars.json
@@ -1631,13 +1631,15 @@
             "institution": "columbiau",
             "location": "Upton NY",
             "meeting_name": "2018 NSLS-II and CFN Users Meeting",
+            "presenter": "sbillinge",
             "notes": [
                 "We hope the weather will be sunny",
                 "if the weather is nice we will go to the beach"
             ],
             "project": "18sob_clustermining",
             "status": "accepted",
             "title": "ClusterMining: extracting core structures of metallic nanoparticles from the atomic pair distribution function",
+            "talk_id": "30-graphite-rock",
             "type": "poster"
         },
         {

diff --git a/src/regolith/schemas.json b/src/regolith/schemas.json
@@ -1961,6 +1961,11 @@
             "required": false,
             "type": "string"
         },
+        "presenter": {
+            "description": "The _id or name of the person making the presentation",
+            "required": false,
+            "type": "string"
+        },
         "location": {
             "description": "city and {state or country} of meeting",
             "required": false,
@@ -1992,6 +1997,11 @@
             "required": false,
             "type": "string"
         },
+        "talk_id": {
+            "description": "The id of the talk that will be presented",
+            "required": false,
+            "type": "string"
+        },
         "title": {
             "description": "title of the presentation",
             "required": true,

diff --git a/tests/outputs/a_presentation/presentations.yaml b/tests/outputs/a_presentation/presentations.yaml
@@ -35,8 +35,10 @@
   notes:
     - We hope the weather will be sunny
     - if the weather is nice we will go to the beach
+  presenter: sbillinge
   project: 18sob_clustermining
   status: accepted
+  talk_id: 30-graphite-rock
   title: 'ClusterMining: extracting core structures of metallic nanoparticles from
     the atomic pair distribution function'
   type: poster