Merge branch 'main' into feature-clock-parse

.gitlab-ci.yml

@@ -52,7 +52,8 @@ pages:
     - mkdir -p public
     - mv docs/build public/dev
     - ls docs/src -R
-    - mv docs/src/assets/*.html public
+    - mkdir -p public/notebooks
+    - mv docs/src/assets/*.html public/notebooks
   artifacts:
     paths:
       - public

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Exported notebooks are now deployed under notebooks url
+
+### Fixed
+
+- Converter version is filled during `create_database_from_exported_csvs`
+
 ## [0.2.0] - 2024-10-23
 
 - Julia v1.11 was released and v1.10 is new LTS
@@ -46,5 +53,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Docs on the internal (Julia implementation)
 
 [unreleased]: https://gitlab.cern.ch/wotsubo/PSBoardDataBase/-/compare/v0.2.0...main
-[0.2.0]: https://gitlab.cern.ch/wotsubo/PSBoardDataBase/~/compare/v0.1.0...v0.2.0
+[0.2.0]: https://gitlab.cern.ch/wotsubo/PSBoardDataBase/-/compare/v0.1.0...v0.2.0
 [0.1.0]: https://gitlab.cern.ch/wotsubo/PSBoardDataBase/~/tags/v0.1.0

Project.toml

@@ -1,7 +1,7 @@
 name = "PSBoardDataBase"
 uuid = "779f6a9c-59fa-41f1-8ed1-e9a91eccb2f5"
 authors = ["Wataru Otsubo <wotsubo@icepp.s.u-tokyo.ac.jp>"]
-version = "0.2.0"
+version = "0.2.0-DEV"
 
 [deps]
 AutoHashEquals = "15f4f7f2-30c1-5605-9d31-71845cf9641f"

README.md

@@ -10,5 +10,5 @@ PS Boardに関する(特にQAQCの結果に関する)データベース。
 PS Board QAQCに関しては[こちら](https://gitlab.cern.ch/dhashimo/PS_Board_QAQC)
 
 解析結果の例
-- 結果一覧閲覧用簡易アプリケーション: https://psboard-database.docs.cern.ch/get_results.html
-- skewを複数回測定した個体に関する統計調査: https://psboard-database.docs.cern.ch/skew_stats.html
+- 結果一覧閲覧用簡易アプリケーション: https://psboard-database.docs.cern.ch/notebooks/get_results.html
+- skewに関する統計調査: https://psboard-database.docs.cern.ch/notebooks/skew_stats.html

src/PSBoardDataBase.jl

@@ -63,6 +63,7 @@ function create_database_from_exported_csvs(
     extra_100test_result_df = CSV.read(hundred_csv, DataFrame)
     jathubs_table = CSV.read(jathubs_csv, DataFrame)
 
+    insert_version_info(db)
     insert_qaqc_campaign_id(db)
     insert_qaqc_positions(db, jathubs_table)
 

src/import_data.jl

@@ -10,6 +10,7 @@ function insert_version_info(db::SQLite.DB)
         INSERT INTO versions VALUES (:converter)
         """,
     )
+    @info "converter version info" pkgversion(@__MODULE__) |> string
     DBInterface.execute(
         stmt_insert_version,
         (; converter = pkgversion(@__MODULE__) |> string),