From b0cd2b2e90809823fc1a9655763f7c183ad35edc Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Thu, 24 Oct 2024 08:21:49 +0200 Subject: [PATCH 1/5] Update CHANGELOG.md (fix 0.2.0 diff) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86eb65e..3682b41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,5 +46,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 From 6886774269906ac40950c76e7a2d3967692e59bf Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Mon, 4 Nov 2024 04:39:25 +0900 Subject: [PATCH 2/5] update(version): 0.2.0-DEV --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 2ddcb42..8e0e3d1 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PSBoardDataBase" uuid = "779f6a9c-59fa-41f1-8ed1-e9a91eccb2f5" authors = ["Wataru Otsubo "] -version = "0.2.0" +version = "0.2.0-DEV" [deps] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" From 6547e1b1f86424bdf07b4f94bb3eb7f6c93b4639 Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Sun, 3 Nov 2024 21:08:43 +0100 Subject: [PATCH 3/5] change(pages): deploy path of exported notebooks under `notebooks` --- .gitlab-ci.yml | 2 +- CHANGELOG.md | 3 +++ README.md | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00760ae..77b5693 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ pages: - mkdir -p public - mv docs/build public/dev - ls docs/src -R - - mv docs/src/assets/*.html public + - mv docs/src/assets/*.html public/notebooks artifacts: paths: - public diff --git a/CHANGELOG.md b/CHANGELOG.md index 3682b41..743e206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Exported notebooks are now deployed under notebooks url + ## [0.2.0] - 2024-10-23 - Julia v1.11 was released and v1.10 is new LTS diff --git a/README.md b/README.md index 8fdac50..f54c280 100644 --- a/README.md +++ b/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 From c7247a366370ce40aabe080440f99fc4b788a7d7 Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Sun, 3 Nov 2024 21:12:20 +0100 Subject: [PATCH 4/5] fix(versions): add version info in database --- CHANGELOG.md | 4 ++++ src/PSBoardDataBase.jl | 1 + src/import_data.jl | 1 + 3 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 743e206..ecc56eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 diff --git a/src/PSBoardDataBase.jl b/src/PSBoardDataBase.jl index 71bec98..b050640 100644 --- a/src/PSBoardDataBase.jl +++ b/src/PSBoardDataBase.jl @@ -62,6 +62,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) diff --git a/src/import_data.jl b/src/import_data.jl index e3647c3..1c55041 100644 --- a/src/import_data.jl +++ b/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, (; converter = pkgversion(@__MODULE__) |> string)) nothing From f7ab159efff934600ea49270ad6eedbe5f4fa1ff Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Mon, 4 Nov 2024 05:14:42 +0900 Subject: [PATCH 5/5] fix(deploy): mkdir public/notebooks --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77b5693..d8f0df5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ pages: - mkdir -p public - mv docs/build public/dev - ls docs/src -R + - mkdir -p public/notebooks - mv docs/src/assets/*.html public/notebooks artifacts: paths: