From b91bef4c73f3360674bff4a5cf8b39354af529ef Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Thu, 17 Jul 2025 09:29:40 -0400 Subject: [PATCH 1/4] adding presenter and talk_id to presentations schema --- src/regolith/exemplars.json | 2 ++ src/regolith/schemas.json | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/regolith/exemplars.json b/src/regolith/exemplars.json index 7edf75d5a..6baf0fd6f 100644 --- a/src/regolith/exemplars.json +++ b/src/regolith/exemplars.json @@ -1631,6 +1631,7 @@ "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" @@ -1638,6 +1639,7 @@ "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 index d6f01e721..f2468a87c 100644 --- 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, From cf50b4367c7b9b5fe9f9a60f024e7f54b53f41f3 Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Thu, 17 Jul 2025 09:34:31 -0400 Subject: [PATCH 2/4] adding presenter and talk_id to schema --- news/talks-schema.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/talks-schema.rst diff --git a/news/talks-schema.rst b/news/talks-schema.rst new file mode 100644 index 000000000..79879be5e --- /dev/null +++ b/news/talks-schema.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* Added presenter and talk_id to the presentations schema + +**Security:** + +* From 154d27fb577ca8fbbb49a07ed26a680c93abaf4a Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Thu, 17 Jul 2025 11:29:29 -0400 Subject: [PATCH 3/4] global replace of doc with docs --- .flake8 | 2 +- .gitignore | 2 +- .readthedocs.yaml | 2 +- {doc => docs}/Makefile | 0 {doc => docs}/make.bat | 72 +++++++++--------- {doc => docs}/source/Makefile | 0 {doc => docs}/source/_static/.placeholder | 0 {doc => docs}/source/_static/cv.png | Bin .../source/_static/regolith-logo-white.png | Bin .../source/_static/regolith-logo-white.svg | 0 .../source/_static/regolith-logo.ico | Bin .../source/_static/regolith-logo.png | Bin .../source/_static/regolith-logo.svg | 0 {doc => docs}/source/_static/rg-dungeon.js | 0 {doc => docs}/source/_static/unicodetiles.css | 0 .../source/_static/unicodetiles.min.js | 0 .../blackcloud/static/blackcloud.css_t | 0 .../source/_themes/blackcloud/theme.conf | 0 .../source/api/regolith.builders.rst | 0 {doc => docs}/source/api/regolith.helpers.rst | 0 {doc => docs}/source/api/regolith.rst | 0 .../source/api/regolith.static.img.rst | 0 {doc => docs}/source/api/regolith.static.rst | 0 .../source/api/regolith.templates.rst | 0 .../source/collections/abstracts.rst | 0 .../source/collections/assignments.rst | 0 {doc => docs}/source/collections/beamplan.rst | 0 {doc => docs}/source/collections/blog.rst | 0 .../source/collections/citations.rst | 0 {doc => docs}/source/collections/contacts.rst | 0 {doc => docs}/source/collections/courses.rst | 0 {doc => docs}/source/collections/expenses.rst | 0 .../source/collections/formalletters.rst | 0 {doc => docs}/source/collections/grades.rst | 0 {doc => docs}/source/collections/grants.rst | 0 {doc => docs}/source/collections/groups.rst | 0 {doc => docs}/source/collections/index.rst | 0 .../source/collections/institutions.rst | 0 {doc => docs}/source/collections/jobs.rst | 0 {doc => docs}/source/collections/meetings.rst | 0 {doc => docs}/source/collections/news.rst | 0 {doc => docs}/source/collections/people.rst | 0 .../source/collections/presentations.rst | 0 {doc => docs}/source/collections/projecta.rst | 0 {doc => docs}/source/collections/projects.rst | 0 .../source/collections/proposalReviews.rst | 0 .../source/collections/proposals.rst | 0 .../source/collections/reading_lists.rst | 0 .../source/collections/refereeReports.rst | 0 {doc => docs}/source/collections/software.rst | 0 {doc => docs}/source/collections/students.rst | 0 {doc => docs}/source/collections/todos.rst | 0 {doc => docs}/source/commands/add.rst | 0 {doc => docs}/source/commands/app.rst | 0 {doc => docs}/source/commands/build.rst | 0 {doc => docs}/source/commands/classlist.rst | 0 {doc => docs}/source/commands/deploy.rst | 0 {doc => docs}/source/commands/email.rst | 0 {doc => docs}/source/commands/fs-to-mongo.rst | 0 {doc => docs}/source/commands/grade.rst | 0 {doc => docs}/source/commands/helper.rst | 0 {doc => docs}/source/commands/index.html | 2 +- {doc => docs}/source/commands/index.rst | 0 {doc => docs}/source/commands/ingest.rst | 0 .../source/commands/json-to-yaml.rst | 0 {doc => docs}/source/commands/mongo-to-fs.rst | 0 {doc => docs}/source/commands/rc.rst | 0 {doc => docs}/source/commands/store.rst | 0 {doc => docs}/source/commands/validate.rst | 0 .../source/commands/yaml-to-json.rst | 0 {doc => docs}/source/conf.py | 3 +- .../source/database_maintenance/index.rst | 0 .../mongo_maintenance.rst | 0 .../dp_regolith_prums_to_mongodb.md | 0 {doc => docs}/source/helper_gui.rst | 0 .../source/helper_gui_images/a_projectum.png | Bin .../source/helper_gui_images/l_members.png | Bin .../source/helper_gui_images/layout.png | Bin .../source/helper_gui_images/u_logurl.png | Bin .../source/helper_gui_images/workflow1.png | Bin .../source/helper_gui_images/workflow10.png | Bin .../source/helper_gui_images/workflow12.png | Bin .../source/helper_gui_images/workflow3.png | Bin .../source/helper_gui_images/workflow6.png | Bin .../source/helper_gui_images/workflow8.png | Bin {doc => docs}/source/index.rst | 0 {doc => docs}/source/license.rst | 0 {doc => docs}/source/make.bat | 0 {doc => docs}/source/rc.rst | 0 {doc => docs}/source/regolithrc.json | 0 {doc => docs}/source/release.rst | 0 {doc => docs}/source/tutorials/broker.rst | 0 {doc => docs}/source/tutorials/index.rst | 0 requirements/{test.txt => tests.txt} | 0 94 files changed, 41 insertions(+), 42 deletions(-) rename {doc => docs}/Makefile (100%) rename {doc => docs}/make.bat (95%) rename {doc => docs}/source/Makefile (100%) rename {doc => docs}/source/_static/.placeholder (100%) rename {doc => docs}/source/_static/cv.png (100%) rename {doc => docs}/source/_static/regolith-logo-white.png (100%) rename {doc => docs}/source/_static/regolith-logo-white.svg (100%) rename {doc => docs}/source/_static/regolith-logo.ico (100%) rename {doc => docs}/source/_static/regolith-logo.png (100%) rename {doc => docs}/source/_static/regolith-logo.svg (100%) rename {doc => docs}/source/_static/rg-dungeon.js (100%) rename {doc => docs}/source/_static/unicodetiles.css (100%) rename {doc => docs}/source/_static/unicodetiles.min.js (100%) rename {doc => docs}/source/_themes/blackcloud/static/blackcloud.css_t (100%) rename {doc => docs}/source/_themes/blackcloud/theme.conf (100%) rename {doc => docs}/source/api/regolith.builders.rst (100%) rename {doc => docs}/source/api/regolith.helpers.rst (100%) rename {doc => docs}/source/api/regolith.rst (100%) rename {doc => docs}/source/api/regolith.static.img.rst (100%) rename {doc => docs}/source/api/regolith.static.rst (100%) rename {doc => docs}/source/api/regolith.templates.rst (100%) rename {doc => docs}/source/collections/abstracts.rst (100%) rename {doc => docs}/source/collections/assignments.rst (100%) rename {doc => docs}/source/collections/beamplan.rst (100%) rename {doc => docs}/source/collections/blog.rst (100%) rename {doc => docs}/source/collections/citations.rst (100%) rename {doc => docs}/source/collections/contacts.rst (100%) rename {doc => docs}/source/collections/courses.rst (100%) rename {doc => docs}/source/collections/expenses.rst (100%) rename {doc => docs}/source/collections/formalletters.rst (100%) rename {doc => docs}/source/collections/grades.rst (100%) rename {doc => docs}/source/collections/grants.rst (100%) rename {doc => docs}/source/collections/groups.rst (100%) rename {doc => docs}/source/collections/index.rst (100%) rename {doc => docs}/source/collections/institutions.rst (100%) rename {doc => docs}/source/collections/jobs.rst (100%) rename {doc => docs}/source/collections/meetings.rst (100%) rename {doc => docs}/source/collections/news.rst (100%) rename {doc => docs}/source/collections/people.rst (100%) rename {doc => docs}/source/collections/presentations.rst (100%) rename {doc => docs}/source/collections/projecta.rst (100%) rename {doc => docs}/source/collections/projects.rst (100%) rename {doc => docs}/source/collections/proposalReviews.rst (100%) rename {doc => docs}/source/collections/proposals.rst (100%) rename {doc => docs}/source/collections/reading_lists.rst (100%) rename {doc => docs}/source/collections/refereeReports.rst (100%) rename {doc => docs}/source/collections/software.rst (100%) rename {doc => docs}/source/collections/students.rst (100%) rename {doc => docs}/source/collections/todos.rst (100%) rename {doc => docs}/source/commands/add.rst (100%) rename {doc => docs}/source/commands/app.rst (100%) rename {doc => docs}/source/commands/build.rst (100%) rename {doc => docs}/source/commands/classlist.rst (100%) rename {doc => docs}/source/commands/deploy.rst (100%) rename {doc => docs}/source/commands/email.rst (100%) rename {doc => docs}/source/commands/fs-to-mongo.rst (100%) rename {doc => docs}/source/commands/grade.rst (100%) rename {doc => docs}/source/commands/helper.rst (100%) rename {doc => docs}/source/commands/index.html (99%) rename {doc => docs}/source/commands/index.rst (100%) rename {doc => docs}/source/commands/ingest.rst (100%) rename {doc => docs}/source/commands/json-to-yaml.rst (100%) rename {doc => docs}/source/commands/mongo-to-fs.rst (100%) rename {doc => docs}/source/commands/rc.rst (100%) rename {doc => docs}/source/commands/store.rst (100%) rename {doc => docs}/source/commands/validate.rst (100%) rename {doc => docs}/source/commands/yaml-to-json.rst (100%) rename {doc => docs}/source/conf.py (99%) rename {doc => docs}/source/database_maintenance/index.rst (100%) rename {doc => docs}/source/database_maintenance/mongo_maintenance.rst (100%) rename {doc => docs}/source/developer_notes/dp_regolith_prums_to_mongodb.md (100%) rename {doc => docs}/source/helper_gui.rst (100%) rename {doc => docs}/source/helper_gui_images/a_projectum.png (100%) rename {doc => docs}/source/helper_gui_images/l_members.png (100%) rename {doc => docs}/source/helper_gui_images/layout.png (100%) rename {doc => docs}/source/helper_gui_images/u_logurl.png (100%) rename {doc => docs}/source/helper_gui_images/workflow1.png (100%) rename {doc => docs}/source/helper_gui_images/workflow10.png (100%) rename {doc => docs}/source/helper_gui_images/workflow12.png (100%) rename {doc => docs}/source/helper_gui_images/workflow3.png (100%) rename {doc => docs}/source/helper_gui_images/workflow6.png (100%) rename {doc => docs}/source/helper_gui_images/workflow8.png (100%) rename {doc => docs}/source/index.rst (100%) rename {doc => docs}/source/license.rst (100%) rename {doc => docs}/source/make.bat (100%) rename {doc => docs}/source/rc.rst (100%) rename {doc => docs}/source/regolithrc.json (100%) rename {doc => docs}/source/release.rst (100%) rename {doc => docs}/source/tutorials/broker.rst (100%) rename {doc => docs}/source/tutorials/index.rst (100%) rename requirements/{test.txt => tests.txt} (100%) diff --git a/.flake8 b/.flake8 index 04d2d0b0c..a51051160 100644 --- 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 index 949d3f213..d727eafb9 100644 --- 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 index 47f7a0177..aaa888958 100644 --- 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 b/docs/Makefile similarity index 100% rename from doc/Makefile rename to docs/Makefile diff --git a/doc/make.bat b/docs/make.bat similarity index 95% rename from doc/make.bat rename to docs/make.bat index ac53d5bd0..2be830693 100644 --- a/doc/make.bat +++ b/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 b/docs/source/Makefile similarity index 100% rename from doc/source/Makefile rename to docs/source/Makefile diff --git a/doc/source/_static/.placeholder b/docs/source/_static/.placeholder similarity index 100% rename from doc/source/_static/.placeholder rename to docs/source/_static/.placeholder diff --git a/doc/source/_static/cv.png b/docs/source/_static/cv.png similarity index 100% rename from doc/source/_static/cv.png rename to docs/source/_static/cv.png diff --git a/doc/source/_static/regolith-logo-white.png b/docs/source/_static/regolith-logo-white.png similarity index 100% rename from doc/source/_static/regolith-logo-white.png rename to docs/source/_static/regolith-logo-white.png diff --git a/doc/source/_static/regolith-logo-white.svg b/docs/source/_static/regolith-logo-white.svg similarity index 100% rename from doc/source/_static/regolith-logo-white.svg rename to docs/source/_static/regolith-logo-white.svg diff --git a/doc/source/_static/regolith-logo.ico b/docs/source/_static/regolith-logo.ico similarity index 100% rename from doc/source/_static/regolith-logo.ico rename to docs/source/_static/regolith-logo.ico diff --git a/doc/source/_static/regolith-logo.png b/docs/source/_static/regolith-logo.png similarity index 100% rename from doc/source/_static/regolith-logo.png rename to docs/source/_static/regolith-logo.png diff --git a/doc/source/_static/regolith-logo.svg b/docs/source/_static/regolith-logo.svg similarity index 100% rename from doc/source/_static/regolith-logo.svg rename to docs/source/_static/regolith-logo.svg diff --git a/doc/source/_static/rg-dungeon.js b/docs/source/_static/rg-dungeon.js similarity index 100% rename from doc/source/_static/rg-dungeon.js rename to docs/source/_static/rg-dungeon.js diff --git a/doc/source/_static/unicodetiles.css b/docs/source/_static/unicodetiles.css similarity index 100% rename from doc/source/_static/unicodetiles.css rename to docs/source/_static/unicodetiles.css diff --git a/doc/source/_static/unicodetiles.min.js b/docs/source/_static/unicodetiles.min.js similarity index 100% rename from doc/source/_static/unicodetiles.min.js rename to docs/source/_static/unicodetiles.min.js diff --git a/doc/source/_themes/blackcloud/static/blackcloud.css_t b/docs/source/_themes/blackcloud/static/blackcloud.css_t similarity index 100% rename from doc/source/_themes/blackcloud/static/blackcloud.css_t rename to docs/source/_themes/blackcloud/static/blackcloud.css_t diff --git a/doc/source/_themes/blackcloud/theme.conf b/docs/source/_themes/blackcloud/theme.conf similarity index 100% rename from doc/source/_themes/blackcloud/theme.conf rename to docs/source/_themes/blackcloud/theme.conf diff --git a/doc/source/api/regolith.builders.rst b/docs/source/api/regolith.builders.rst similarity index 100% rename from doc/source/api/regolith.builders.rst rename to docs/source/api/regolith.builders.rst diff --git a/doc/source/api/regolith.helpers.rst b/docs/source/api/regolith.helpers.rst similarity index 100% rename from doc/source/api/regolith.helpers.rst rename to docs/source/api/regolith.helpers.rst diff --git a/doc/source/api/regolith.rst b/docs/source/api/regolith.rst similarity index 100% rename from doc/source/api/regolith.rst rename to docs/source/api/regolith.rst diff --git a/doc/source/api/regolith.static.img.rst b/docs/source/api/regolith.static.img.rst similarity index 100% rename from doc/source/api/regolith.static.img.rst rename to docs/source/api/regolith.static.img.rst diff --git a/doc/source/api/regolith.static.rst b/docs/source/api/regolith.static.rst similarity index 100% rename from doc/source/api/regolith.static.rst rename to docs/source/api/regolith.static.rst diff --git a/doc/source/api/regolith.templates.rst b/docs/source/api/regolith.templates.rst similarity index 100% rename from doc/source/api/regolith.templates.rst rename to docs/source/api/regolith.templates.rst diff --git a/doc/source/collections/abstracts.rst b/docs/source/collections/abstracts.rst similarity index 100% rename from doc/source/collections/abstracts.rst rename to docs/source/collections/abstracts.rst diff --git a/doc/source/collections/assignments.rst b/docs/source/collections/assignments.rst similarity index 100% rename from doc/source/collections/assignments.rst rename to docs/source/collections/assignments.rst diff --git a/doc/source/collections/beamplan.rst b/docs/source/collections/beamplan.rst similarity index 100% rename from doc/source/collections/beamplan.rst rename to docs/source/collections/beamplan.rst diff --git a/doc/source/collections/blog.rst b/docs/source/collections/blog.rst similarity index 100% rename from doc/source/collections/blog.rst rename to docs/source/collections/blog.rst diff --git a/doc/source/collections/citations.rst b/docs/source/collections/citations.rst similarity index 100% rename from doc/source/collections/citations.rst rename to docs/source/collections/citations.rst diff --git a/doc/source/collections/contacts.rst b/docs/source/collections/contacts.rst similarity index 100% rename from doc/source/collections/contacts.rst rename to docs/source/collections/contacts.rst diff --git a/doc/source/collections/courses.rst b/docs/source/collections/courses.rst similarity index 100% rename from doc/source/collections/courses.rst rename to docs/source/collections/courses.rst diff --git a/doc/source/collections/expenses.rst b/docs/source/collections/expenses.rst similarity index 100% rename from doc/source/collections/expenses.rst rename to docs/source/collections/expenses.rst diff --git a/doc/source/collections/formalletters.rst b/docs/source/collections/formalletters.rst similarity index 100% rename from doc/source/collections/formalletters.rst rename to docs/source/collections/formalletters.rst diff --git a/doc/source/collections/grades.rst b/docs/source/collections/grades.rst similarity index 100% rename from doc/source/collections/grades.rst rename to docs/source/collections/grades.rst diff --git a/doc/source/collections/grants.rst b/docs/source/collections/grants.rst similarity index 100% rename from doc/source/collections/grants.rst rename to docs/source/collections/grants.rst diff --git a/doc/source/collections/groups.rst b/docs/source/collections/groups.rst similarity index 100% rename from doc/source/collections/groups.rst rename to docs/source/collections/groups.rst diff --git a/doc/source/collections/index.rst b/docs/source/collections/index.rst similarity index 100% rename from doc/source/collections/index.rst rename to docs/source/collections/index.rst diff --git a/doc/source/collections/institutions.rst b/docs/source/collections/institutions.rst similarity index 100% rename from doc/source/collections/institutions.rst rename to docs/source/collections/institutions.rst diff --git a/doc/source/collections/jobs.rst b/docs/source/collections/jobs.rst similarity index 100% rename from doc/source/collections/jobs.rst rename to docs/source/collections/jobs.rst diff --git a/doc/source/collections/meetings.rst b/docs/source/collections/meetings.rst similarity index 100% rename from doc/source/collections/meetings.rst rename to docs/source/collections/meetings.rst diff --git a/doc/source/collections/news.rst b/docs/source/collections/news.rst similarity index 100% rename from doc/source/collections/news.rst rename to docs/source/collections/news.rst diff --git a/doc/source/collections/people.rst b/docs/source/collections/people.rst similarity index 100% rename from doc/source/collections/people.rst rename to docs/source/collections/people.rst diff --git a/doc/source/collections/presentations.rst b/docs/source/collections/presentations.rst similarity index 100% rename from doc/source/collections/presentations.rst rename to docs/source/collections/presentations.rst diff --git a/doc/source/collections/projecta.rst b/docs/source/collections/projecta.rst similarity index 100% rename from doc/source/collections/projecta.rst rename to docs/source/collections/projecta.rst diff --git a/doc/source/collections/projects.rst b/docs/source/collections/projects.rst similarity index 100% rename from doc/source/collections/projects.rst rename to docs/source/collections/projects.rst diff --git a/doc/source/collections/proposalReviews.rst b/docs/source/collections/proposalReviews.rst similarity index 100% rename from doc/source/collections/proposalReviews.rst rename to docs/source/collections/proposalReviews.rst diff --git a/doc/source/collections/proposals.rst b/docs/source/collections/proposals.rst similarity index 100% rename from doc/source/collections/proposals.rst rename to docs/source/collections/proposals.rst diff --git a/doc/source/collections/reading_lists.rst b/docs/source/collections/reading_lists.rst similarity index 100% rename from doc/source/collections/reading_lists.rst rename to docs/source/collections/reading_lists.rst diff --git a/doc/source/collections/refereeReports.rst b/docs/source/collections/refereeReports.rst similarity index 100% rename from doc/source/collections/refereeReports.rst rename to docs/source/collections/refereeReports.rst diff --git a/doc/source/collections/software.rst b/docs/source/collections/software.rst similarity index 100% rename from doc/source/collections/software.rst rename to docs/source/collections/software.rst diff --git a/doc/source/collections/students.rst b/docs/source/collections/students.rst similarity index 100% rename from doc/source/collections/students.rst rename to docs/source/collections/students.rst diff --git a/doc/source/collections/todos.rst b/docs/source/collections/todos.rst similarity index 100% rename from doc/source/collections/todos.rst rename to docs/source/collections/todos.rst diff --git a/doc/source/commands/add.rst b/docs/source/commands/add.rst similarity index 100% rename from doc/source/commands/add.rst rename to docs/source/commands/add.rst diff --git a/doc/source/commands/app.rst b/docs/source/commands/app.rst similarity index 100% rename from doc/source/commands/app.rst rename to docs/source/commands/app.rst diff --git a/doc/source/commands/build.rst b/docs/source/commands/build.rst similarity index 100% rename from doc/source/commands/build.rst rename to docs/source/commands/build.rst diff --git a/doc/source/commands/classlist.rst b/docs/source/commands/classlist.rst similarity index 100% rename from doc/source/commands/classlist.rst rename to docs/source/commands/classlist.rst diff --git a/doc/source/commands/deploy.rst b/docs/source/commands/deploy.rst similarity index 100% rename from doc/source/commands/deploy.rst rename to docs/source/commands/deploy.rst diff --git a/doc/source/commands/email.rst b/docs/source/commands/email.rst similarity index 100% rename from doc/source/commands/email.rst rename to docs/source/commands/email.rst diff --git a/doc/source/commands/fs-to-mongo.rst b/docs/source/commands/fs-to-mongo.rst similarity index 100% rename from doc/source/commands/fs-to-mongo.rst rename to docs/source/commands/fs-to-mongo.rst diff --git a/doc/source/commands/grade.rst b/docs/source/commands/grade.rst similarity index 100% rename from doc/source/commands/grade.rst rename to docs/source/commands/grade.rst diff --git a/doc/source/commands/helper.rst b/docs/source/commands/helper.rst similarity index 100% rename from doc/source/commands/helper.rst rename to docs/source/commands/helper.rst diff --git a/doc/source/commands/index.html b/docs/source/commands/index.html similarity index 99% rename from doc/source/commands/index.html rename to docs/source/commands/index.html index cba2d130c..e69b437a7 100644 --- a/doc/source/commands/index.html +++ b/docs/source/commands/index.html @@ -394,7 +394,7 @@

Regolith Commands

validate Validates db
-

System Message: ERROR/3 (/Users/huarundong/dbs/regolith/doc/source/commands/index.rst, line 38)

+

System Message: ERROR/3 (/Users/huarundong/dbs/regolith/docs/source/commands/index.rst, line 38)

Unknown directive type "toctree".

 .. toctree::
diff --git a/doc/source/commands/index.rst b/docs/source/commands/index.rst
similarity index 100%
rename from doc/source/commands/index.rst
rename to docs/source/commands/index.rst
diff --git a/doc/source/commands/ingest.rst b/docs/source/commands/ingest.rst
similarity index 100%
rename from doc/source/commands/ingest.rst
rename to docs/source/commands/ingest.rst
diff --git a/doc/source/commands/json-to-yaml.rst b/docs/source/commands/json-to-yaml.rst
similarity index 100%
rename from doc/source/commands/json-to-yaml.rst
rename to docs/source/commands/json-to-yaml.rst
diff --git a/doc/source/commands/mongo-to-fs.rst b/docs/source/commands/mongo-to-fs.rst
similarity index 100%
rename from doc/source/commands/mongo-to-fs.rst
rename to docs/source/commands/mongo-to-fs.rst
diff --git a/doc/source/commands/rc.rst b/docs/source/commands/rc.rst
similarity index 100%
rename from doc/source/commands/rc.rst
rename to docs/source/commands/rc.rst
diff --git a/doc/source/commands/store.rst b/docs/source/commands/store.rst
similarity index 100%
rename from doc/source/commands/store.rst
rename to docs/source/commands/store.rst
diff --git a/doc/source/commands/validate.rst b/docs/source/commands/validate.rst
similarity index 100%
rename from doc/source/commands/validate.rst
rename to docs/source/commands/validate.rst
diff --git a/doc/source/commands/yaml-to-json.rst b/docs/source/commands/yaml-to-json.rst
similarity index 100%
rename from doc/source/commands/yaml-to-json.rst
rename to docs/source/commands/yaml-to-json.rst
diff --git a/doc/source/conf.py b/docs/source/conf.py
similarity index 99%
rename from doc/source/conf.py
rename to docs/source/conf.py
index 107107100..d329f7ac0 100644
--- a/doc/source/conf.py
+++ b/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 b/docs/source/database_maintenance/index.rst
similarity index 100%
rename from doc/source/database_maintenance/index.rst
rename to docs/source/database_maintenance/index.rst
diff --git a/doc/source/database_maintenance/mongo_maintenance.rst b/docs/source/database_maintenance/mongo_maintenance.rst
similarity index 100%
rename from doc/source/database_maintenance/mongo_maintenance.rst
rename to docs/source/database_maintenance/mongo_maintenance.rst
diff --git a/doc/source/developer_notes/dp_regolith_prums_to_mongodb.md b/docs/source/developer_notes/dp_regolith_prums_to_mongodb.md
similarity index 100%
rename from doc/source/developer_notes/dp_regolith_prums_to_mongodb.md
rename to docs/source/developer_notes/dp_regolith_prums_to_mongodb.md
diff --git a/doc/source/helper_gui.rst b/docs/source/helper_gui.rst
similarity index 100%
rename from doc/source/helper_gui.rst
rename to docs/source/helper_gui.rst
diff --git a/doc/source/helper_gui_images/a_projectum.png b/docs/source/helper_gui_images/a_projectum.png
similarity index 100%
rename from doc/source/helper_gui_images/a_projectum.png
rename to docs/source/helper_gui_images/a_projectum.png
diff --git a/doc/source/helper_gui_images/l_members.png b/docs/source/helper_gui_images/l_members.png
similarity index 100%
rename from doc/source/helper_gui_images/l_members.png
rename to docs/source/helper_gui_images/l_members.png
diff --git a/doc/source/helper_gui_images/layout.png b/docs/source/helper_gui_images/layout.png
similarity index 100%
rename from doc/source/helper_gui_images/layout.png
rename to docs/source/helper_gui_images/layout.png
diff --git a/doc/source/helper_gui_images/u_logurl.png b/docs/source/helper_gui_images/u_logurl.png
similarity index 100%
rename from doc/source/helper_gui_images/u_logurl.png
rename to docs/source/helper_gui_images/u_logurl.png
diff --git a/doc/source/helper_gui_images/workflow1.png b/docs/source/helper_gui_images/workflow1.png
similarity index 100%
rename from doc/source/helper_gui_images/workflow1.png
rename to docs/source/helper_gui_images/workflow1.png
diff --git a/doc/source/helper_gui_images/workflow10.png b/docs/source/helper_gui_images/workflow10.png
similarity index 100%
rename from doc/source/helper_gui_images/workflow10.png
rename to docs/source/helper_gui_images/workflow10.png
diff --git a/doc/source/helper_gui_images/workflow12.png b/docs/source/helper_gui_images/workflow12.png
similarity index 100%
rename from doc/source/helper_gui_images/workflow12.png
rename to docs/source/helper_gui_images/workflow12.png
diff --git a/doc/source/helper_gui_images/workflow3.png b/docs/source/helper_gui_images/workflow3.png
similarity index 100%
rename from doc/source/helper_gui_images/workflow3.png
rename to docs/source/helper_gui_images/workflow3.png
diff --git a/doc/source/helper_gui_images/workflow6.png b/docs/source/helper_gui_images/workflow6.png
similarity index 100%
rename from doc/source/helper_gui_images/workflow6.png
rename to docs/source/helper_gui_images/workflow6.png
diff --git a/doc/source/helper_gui_images/workflow8.png b/docs/source/helper_gui_images/workflow8.png
similarity index 100%
rename from doc/source/helper_gui_images/workflow8.png
rename to docs/source/helper_gui_images/workflow8.png
diff --git a/doc/source/index.rst b/docs/source/index.rst
similarity index 100%
rename from doc/source/index.rst
rename to docs/source/index.rst
diff --git a/doc/source/license.rst b/docs/source/license.rst
similarity index 100%
rename from doc/source/license.rst
rename to docs/source/license.rst
diff --git a/doc/source/make.bat b/docs/source/make.bat
similarity index 100%
rename from doc/source/make.bat
rename to docs/source/make.bat
diff --git a/doc/source/rc.rst b/docs/source/rc.rst
similarity index 100%
rename from doc/source/rc.rst
rename to docs/source/rc.rst
diff --git a/doc/source/regolithrc.json b/docs/source/regolithrc.json
similarity index 100%
rename from doc/source/regolithrc.json
rename to docs/source/regolithrc.json
diff --git a/doc/source/release.rst b/docs/source/release.rst
similarity index 100%
rename from doc/source/release.rst
rename to docs/source/release.rst
diff --git a/doc/source/tutorials/broker.rst b/docs/source/tutorials/broker.rst
similarity index 100%
rename from doc/source/tutorials/broker.rst
rename to docs/source/tutorials/broker.rst
diff --git a/doc/source/tutorials/index.rst b/docs/source/tutorials/index.rst
similarity index 100%
rename from doc/source/tutorials/index.rst
rename to docs/source/tutorials/index.rst
diff --git a/requirements/test.txt b/requirements/tests.txt
similarity index 100%
rename from requirements/test.txt
rename to requirements/tests.txt

From 00179badbdf3dfa84019ece53371ba598ca0f71d Mon Sep 17 00:00:00 2001
From: Simon Billinge 
Date: Fri, 18 Jul 2025 10:46:32 -0400
Subject: [PATCH 4/4] add presenter and talk_id to tests

---
 tests/outputs/a_presentation/presentations.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/outputs/a_presentation/presentations.yaml b/tests/outputs/a_presentation/presentations.yaml
index a88d965c2..312d034a5 100644
--- 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