From 1f3fcc931103e62042f049330d8f07f8e6d80d5c Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 21 Nov 2023 19:13:09 -0600 Subject: [PATCH 1/6] Updated all packages to have the correct Business Source License spdx License identifiers are mostly maintained by Spdx; their list of identifiers is here: https://spdx.github.io/license-list-data/ According to the above page, the correct identifier for the Business Source License is `BUSL-1.1` This commit updates the license on all crates Each crate that is being published under a new license is given a MAJOR semver change Each crate that is being published under the same license, but using the SPDX instead of a license file, is given a MINOR semver change --- CHANGELOG.md | 12 ++++++++++++ book/lace_preprocess_mdbook_yaml/Cargo.toml | 2 +- cli/Cargo.lock | 20 ++++++++++---------- cli/Cargo.toml | 4 ++-- lace/Cargo.lock | 18 +++++++++--------- lace/Cargo.toml | 20 ++++++++++---------- lace/lace_cc/Cargo.toml | 16 ++++++++-------- lace/lace_codebook/Cargo.toml | 12 ++++++------ lace/lace_consts/Cargo.toml | 4 ++-- lace/lace_data/Cargo.toml | 6 +++--- lace/lace_geweke/Cargo.toml | 8 ++++---- lace/lace_metadata/Cargo.toml | 12 ++++++------ lace/lace_stats/Cargo.toml | 10 +++++----- lace/lace_utils/Cargo.toml | 4 ++-- pylace/Cargo.lock | 20 ++++++++++---------- pylace/Cargo.toml | 8 ++++---- pylace/pyproject.toml | 4 ++-- 17 files changed, 96 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0767fdcb..a0b576b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [python-0.5.1] - UNKNOWN + +### Changed + +- Updated all packages to have the correct SPDX for the Business Source License + +## [rust-0.5.1] - UNKNOWN + +### Changed + +- Updated all packages to have the correct SPDX for the Business Source License + ## [python-0.5.0] - 2023-11-20 ### Added diff --git a/book/lace_preprocess_mdbook_yaml/Cargo.toml b/book/lace_preprocess_mdbook_yaml/Cargo.toml index 5354d299..c80156ac 100644 --- a/book/lace_preprocess_mdbook_yaml/Cargo.toml +++ b/book/lace_preprocess_mdbook_yaml/Cargo.toml @@ -3,7 +3,7 @@ name = "lace_preprocess_mdbook_yaml" version = "0.1.1" authors = ["Promised AI"] edition = "2021" -license = "BSL-1.1" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Utility to check YAML serializations in the Lace MDBook" diff --git a/cli/Cargo.lock b/cli/Cargo.lock index 605cf155..7cfc87fb 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -885,7 +885,7 @@ dependencies = [ [[package]] name = "lace" -version = "0.5.0" +version = "0.5.1" dependencies = [ "bincode", "ctrlc", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "lace-cli" -version = "0.5.0" +version = "0.5.1" dependencies = [ "approx", "clap", @@ -934,7 +934,7 @@ dependencies = [ [[package]] name = "lace_cc" -version = "0.3.0" +version = "0.4.0" dependencies = [ "enum_dispatch", "indicatif", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.3.0" +version = "0.4.0" dependencies = [ "flate2", "lace_consts", @@ -973,14 +973,14 @@ dependencies = [ [[package]] name = "lace_consts" -version = "0.1.4" +version = "0.2.0" dependencies = [ "rv", ] [[package]] name = "lace_data" -version = "0.1.2" +version = "0.2.0" dependencies = [ "lace_utils", "regex", @@ -990,7 +990,7 @@ dependencies = [ [[package]] name = "lace_geweke" -version = "0.1.3" +version = "0.2.0" dependencies = [ "indicatif", "lace_stats", @@ -1002,7 +1002,7 @@ dependencies = [ [[package]] name = "lace_metadata" -version = "0.3.0" +version = "0.4.0" dependencies = [ "bincode", "dirs", @@ -1024,7 +1024,7 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.1.5" +version = "0.2.0" dependencies = [ "itertools", "lace_consts", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "lace_utils" -version = "0.1.2" +version = "0.2.0" dependencies = [ "rand", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 0ea9c1b3..23d915d8 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "lace-cli" -version = "0.5.0" +version = "0.5.1" authors = ["Promised AI"] edition = "2021" rust-version = "1.58.1" -license-file = "LICENSE" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "A probabilistic cross-categorization engine" diff --git a/lace/Cargo.lock b/lace/Cargo.lock index e599b028..16792bb3 100644 --- a/lace/Cargo.lock +++ b/lace/Cargo.lock @@ -1145,7 +1145,7 @@ dependencies = [ [[package]] name = "lace" -version = "0.5.0" +version = "0.5.1" dependencies = [ "approx", "bincode", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "lace_cc" -version = "0.3.0" +version = "0.4.0" dependencies = [ "approx", "criterion", @@ -1210,7 +1210,7 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.3.0" +version = "0.4.0" dependencies = [ "flate2", "indoc", @@ -1230,14 +1230,14 @@ dependencies = [ [[package]] name = "lace_consts" -version = "0.1.4" +version = "0.2.0" dependencies = [ "rv", ] [[package]] name = "lace_data" -version = "0.1.2" +version = "0.2.0" dependencies = [ "approx", "criterion", @@ -1251,7 +1251,7 @@ dependencies = [ [[package]] name = "lace_geweke" -version = "0.1.3" +version = "0.2.0" dependencies = [ "indicatif", "lace_stats", @@ -1263,7 +1263,7 @@ dependencies = [ [[package]] name = "lace_metadata" -version = "0.3.0" +version = "0.4.0" dependencies = [ "bincode", "dirs", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.1.5" +version = "0.2.0" dependencies = [ "approx", "criterion", @@ -1307,7 +1307,7 @@ dependencies = [ [[package]] name = "lace_utils" -version = "0.1.2" +version = "0.2.0" dependencies = [ "approx", "rand", diff --git a/lace/Cargo.toml b/lace/Cargo.toml index b47ecfd7..180b25cf 100644 --- a/lace/Cargo.toml +++ b/lace/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "lace" -version = "0.5.0" +version = "0.5.1" authors = ["Promised AI"] build = "build.rs" edition = "2021" exclude = ["resources/test/*", "target/*"] rust-version = "1.58.1" -license-file = "LICENSE" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "A probabilistic cross-categorization engine" @@ -31,14 +31,14 @@ name = "lace" path = "src/lib.rs" [dependencies] -lace_cc = { path = "lace_cc", version = "0.3.0" } -lace_utils = { path = "lace_utils", version = "0.1.2" } -lace_stats = { path = "lace_stats", version = "0.1.5" } -lace_codebook = { path = "lace_codebook", version = "0.3.0", default_features=false} -lace_geweke = { path = "lace_geweke", version = "0.1.3" } -lace_consts = { path = "lace_consts", version = "0.1.4" } -lace_data = { path = "lace_data", version = "0.1.2" } -lace_metadata = { path = "lace_metadata", version = "0.3.0" } +lace_cc = { path = "lace_cc", version = "0.4.0" } +lace_utils = { path = "lace_utils", version = "0.2.0" } +lace_stats = { path = "lace_stats", version = "0.2.0" } +lace_codebook = { path = "lace_codebook", version = "0.4.0", default_features=false} +lace_geweke = { path = "lace_geweke", version = "0.2.0" } +lace_consts = { path = "lace_consts", version = "0.2.0" } +lace_data = { path = "lace_data", version = "0.2.0" } +lace_metadata = { path = "lace_metadata", version = "0.4.0" } dirs = { version="5", optional = true} itertools = "0.11" num = "0.4" diff --git a/lace/lace_cc/Cargo.toml b/lace/lace_cc/Cargo.toml index de547330..25ae547f 100644 --- a/lace/lace_cc/Cargo.toml +++ b/lace/lace_cc/Cargo.toml @@ -1,21 +1,21 @@ [package] name = "lace_cc" -version = "0.3.0" +version = "0.4.0" authors = ["Promised AI"] edition = "2021" exclude = ["tests/*", "resources/test/*", "target/*"] -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Core of the Lace cross-categorization engine library" [dependencies] -lace_utils = { path = "../lace_utils", version = "0.1.2" } -lace_stats = { path = "../lace_stats", version = "0.1.5" } -lace_geweke = { path = "../lace_geweke", version = "0.1.3" } -lace_consts = { path = "../lace_consts", version = "0.1.4" } -lace_data = { path = "../lace_data", version = "0.1.2" } -lace_codebook = { path = "../lace_codebook", version = "0.3.0" } +lace_utils = { path = "../lace_utils", version = "0.2.0" } +lace_stats = { path = "../lace_stats", version = "0.2.0" } +lace_geweke = { path = "../lace_geweke", version = "0.2.0" } +lace_consts = { path = "../lace_consts", version = "0.2.0" } +lace_data = { path = "../lace_data", version = "0.2.0" } +lace_codebook = { path = "../lace_codebook", version = "0.4.0" } rand = {version="0.8", features=["serde1"]} rayon = "1.5" serde = { version = "1", features = ["derive"] } diff --git a/lace/lace_codebook/Cargo.toml b/lace/lace_codebook/Cargo.toml index e8433c1e..b08f86b1 100644 --- a/lace/lace_codebook/Cargo.toml +++ b/lace/lace_codebook/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "lace_codebook" -version = "0.3.0" +version = "0.4.0" authors = ["Promised.ai"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Contains the Lace codebook specification as well as utilities for generating defaults" [dependencies] -lace_consts = { path = "../lace_consts", version = "0.1.4" } -lace_stats = { path = "../lace_stats", version = "0.1.5" } -lace_utils = { path = "../lace_utils", version = "0.1.2" } -lace_data = { path = "../lace_data", version = "0.1.2" } +lace_consts = { path = "../lace_consts", version = "0.2.0" } +lace_stats = { path = "../lace_stats", version = "0.2.0" } +lace_utils = { path = "../lace_utils", version = "0.2.0" } +lace_data = { path = "../lace_data", version = "0.2.0" } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" maplit = "1" diff --git a/lace/lace_consts/Cargo.toml b/lace/lace_consts/Cargo.toml index 36de4cd5..d5535598 100644 --- a/lace/lace_consts/Cargo.toml +++ b/lace/lace_consts/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "lace_consts" -version = "0.1.4" +version = "0.2.0" authors = ["Promied AI"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Default constants for Lace" diff --git a/lace/lace_data/Cargo.toml b/lace/lace_data/Cargo.toml index 0730480a..7524ad42 100644 --- a/lace/lace_data/Cargo.toml +++ b/lace/lace_data/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "lace_data" -version = "0.1.2" +version = "0.2.0" authors = ["Promised AI"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Data definitions and data container definitions for Lace" [dependencies] -lace_utils = { path = "../lace_utils", version = "0.1.2" } +lace_utils = { path = "../lace_utils", version = "0.2.0" } serde = { version = "1", features = ["derive"] } thiserror = "1.0.19" regex = "1" diff --git a/lace/lace_geweke/Cargo.toml b/lace/lace_geweke/Cargo.toml index 1926a930..c40d3202 100644 --- a/lace/lace_geweke/Cargo.toml +++ b/lace/lace_geweke/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "lace_geweke" -version = "0.1.3" +version = "0.2.0" authors = ["Promised AI"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Geweke tester for Lace" [dependencies] -lace_stats = { path = "../lace_stats", version = "0.1.5" } -lace_utils = { path = "../lace_utils", version = "0.1.2" } +lace_stats = { path = "../lace_stats", version = "0.2.0" } +lace_utils = { path = "../lace_utils", version = "0.2.0" } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" indicatif = "0.17" diff --git a/lace/lace_metadata/Cargo.toml b/lace/lace_metadata/Cargo.toml index 6b26d651..2b254d6f 100644 --- a/lace/lace_metadata/Cargo.toml +++ b/lace/lace_metadata/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "lace_metadata" -version = "0.3.0" +version = "0.4.0" authors = ["Promised AI"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Archive of the metadata (savefile) formats for Lace. In charge of versioning and conversion." [dependencies] -lace_stats = { path = "../lace_stats", version = "0.1.5" } -lace_data = { path = "../lace_data", version = "0.1.2" } -lace_codebook = { path = "../lace_codebook", version = "0.3.0" } -lace_cc = { path = "../lace_cc", version = "0.3.0" } +lace_stats = { path = "../lace_stats", version = "0.2.0" } +lace_data = { path = "../lace_data", version = "0.2.0" } +lace_codebook = { path = "../lace_codebook", version = "0.4.0" } +lace_cc = { path = "../lace_cc", version = "0.4.0" } dirs = "5" serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" diff --git a/lace/lace_stats/Cargo.toml b/lace/lace_stats/Cargo.toml index d6cacc8f..dbfb18fb 100644 --- a/lace/lace_stats/Cargo.toml +++ b/lace/lace_stats/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "lace_stats" -version = "0.1.5" +version = "0.2.0" authors = ["Promised AI"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Contains component model and hyperprior specifications" [dependencies] -lace_utils = { path = "../lace_utils", version = "0.1.2" } -lace_consts = { path = "../lace_consts", version = "0.1.4" } -lace_data = { path = "../lace_data", version = "0.1.2" } +lace_utils = { path = "../lace_utils", version = "0.2.0" } +lace_consts = { path = "../lace_consts", version = "0.2.0" } +lace_data = { path = "../lace_data", version = "0.2.0" } special = "0.10" rand = {version="0.8", features=["serde1"]} rand_xoshiro = "0.6" diff --git a/lace/lace_utils/Cargo.toml b/lace/lace_utils/Cargo.toml index db736455..afdd5b0c 100644 --- a/lace/lace_utils/Cargo.toml +++ b/lace/lace_utils/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "lace_utils" -version = "0.1.2" +version = "0.2.0" authors = ["Promised AI"] edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "Miscellaneous utilities for Lace and shared libraries" diff --git a/pylace/Cargo.lock b/pylace/Cargo.lock index 40e0d9c9..7c321204 100644 --- a/pylace/Cargo.lock +++ b/pylace/Cargo.lock @@ -552,7 +552,7 @@ dependencies = [ [[package]] name = "lace" -version = "0.5.0" +version = "0.5.1" dependencies = [ "bincode", "dirs", @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "lace_cc" -version = "0.3.0" +version = "0.4.0" dependencies = [ "enum_dispatch", "indicatif", @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.3.0" +version = "0.4.0" dependencies = [ "flate2", "lace_consts", @@ -625,14 +625,14 @@ dependencies = [ [[package]] name = "lace_consts" -version = "0.1.4" +version = "0.2.0" dependencies = [ "rv", ] [[package]] name = "lace_data" -version = "0.1.2" +version = "0.2.0" dependencies = [ "lace_utils", "regex", @@ -642,7 +642,7 @@ dependencies = [ [[package]] name = "lace_geweke" -version = "0.1.3" +version = "0.2.0" dependencies = [ "indicatif", "lace_stats", @@ -654,7 +654,7 @@ dependencies = [ [[package]] name = "lace_metadata" -version = "0.3.0" +version = "0.4.0" dependencies = [ "bincode", "dirs", @@ -676,7 +676,7 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.1.5" +version = "0.2.0" dependencies = [ "itertools", "lace_consts", @@ -692,7 +692,7 @@ dependencies = [ [[package]] name = "lace_utils" -version = "0.1.2" +version = "0.2.0" dependencies = [ "rand", ] @@ -1454,7 +1454,7 @@ checksum = "fe7765e19fb2ba6fd4373b8d90399f5321683ea7c11b598c6bbaa3a72e9c83b8" [[package]] name = "pylace" -version = "0.5.0" +version = "0.5.1" dependencies = [ "lace", "lace_utils", diff --git a/pylace/Cargo.toml b/pylace/Cargo.toml index 19ef9903..133e9af7 100644 --- a/pylace/Cargo.toml +++ b/pylace/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "pylace" -version = "0.5.0" +version = "0.5.1" edition = "2021" -license = "SSPL-1.0" +license = "BUSL-1.1" [lib] name = "lace" crate-type = ["cdylib"] [dependencies] -lace = { path = "../lace", version="0.5.0" } -lace_utils = { path = "../lace/lace_utils", version="0.1.2" } +lace = { path = "../lace", version="0.5.1" } +lace_utils = { path = "../lace/lace_utils", version="0.2.0" } rand = "0.8.5" rand_xoshiro = "0.6.0" pyo3 = { version = "0.19", features = ["extension-module"] } diff --git a/pylace/pyproject.toml b/pylace/pyproject.toml index 03225696..953b9896 100644 --- a/pylace/pyproject.toml +++ b/pylace/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "pylace" -version = "0.5.0" +version = "0.5.1" description = "A probabalistic programming ML tool for science" requires-python = ">=3.8" classifiers = [ @@ -21,7 +21,7 @@ classifiers = [ "Programming Language :: Rust", "Topic :: Scientific/Engineering", ] -license = { text="BSL-1.1" } +license = { text="BUSL-1.1" } authors = [ { name="Baxter Eaves", email="bax@redpoll.ai"}, { name="Michael Schmidt", email="schmidt@redpoll.ai"}, From d7289fc47c8cfdf763692d75a1d295fdfb8e4ff7 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 21 Nov 2023 19:24:51 -0600 Subject: [PATCH 2/6] Update the CITATION file, and add some CI to check it --- .github/workflows/citation.yaml | 27 +++++++++++++++++++++++++++ CITATION.cff | 6 +++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/citation.yaml diff --git a/.github/workflows/citation.yaml b/.github/workflows/citation.yaml new file mode 100644 index 00000000..86a2b884 --- /dev/null +++ b/.github/workflows/citation.yaml @@ -0,0 +1,27 @@ +name: 'Check CITATION.cff for correct format' + +on: + workflow_dispatch: + pull_request: + paths: + - CITATION.cff + - lace/Cargo.toml + +jobs: + Validate-CITATION-cff: + runs-on: ubuntu-latest + name: Validate CITATION.cff + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Validate CITATION.cff + uses: dieghernan/cff-validator@v3 + + - name: Verify CITATION.cff version field + run: | + pip install cffconvert yq + CITATION_VERSION=$(cffconvert -f schema.org | jq -r .version) + LACE_VERSION=$(tomlq -r .package.version lace/Cargo.toml) + test "$CITATION_VERSION" = "$LACE_VERSION" diff --git a/CITATION.cff b/CITATION.cff index 8a9ef7b5..7ccca7cf 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -33,6 +33,6 @@ abstract: >- keywords: - Bayesian - Machine Learning -license: BSL-1.1 -version: 0.5.0 -date-released: '2023-11-17' +license: BUSL-1.1 +version: 0.5.1 +date-released: UNKNOWN From 8820bd23893b9d2f08ef956547278476193868fe Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 21 Nov 2023 20:56:39 -0600 Subject: [PATCH 3/6] Stop running testing workflows on pushes to master Testing workflows are running on pushes to master, and it isn't necessary Everything has to go through a pull request anyway, so the extra testing is superfluous and confusing --- .github/workflows/cli-build-test.yaml | 4 ---- .github/workflows/python-build-test.yaml | 3 --- .github/workflows/rust-build-test.yaml | 3 --- 3 files changed, 10 deletions(-) diff --git a/.github/workflows/cli-build-test.yaml b/.github/workflows/cli-build-test.yaml index 69e3e54a..f6c83a79 100644 --- a/.github/workflows/cli-build-test.yaml +++ b/.github/workflows/cli-build-test.yaml @@ -1,10 +1,6 @@ name: 'CLI: Build and Test' on: - push: - branches: - - main - - master workflow_dispatch: pull_request: paths: diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml index bbf9e2e0..ba935117 100644 --- a/.github/workflows/python-build-test.yaml +++ b/.github/workflows/python-build-test.yaml @@ -2,9 +2,6 @@ name: 'Python: Build and Test' on: push: - branches: - - main - - master tags: - python-* workflow_dispatch: diff --git a/.github/workflows/rust-build-test.yaml b/.github/workflows/rust-build-test.yaml index 0ae6b4ac..9ef0993c 100644 --- a/.github/workflows/rust-build-test.yaml +++ b/.github/workflows/rust-build-test.yaml @@ -2,9 +2,6 @@ name: 'Rust: Build and Test' on: push: - branches: - - main - - master tags: - rust-* workflow_dispatch: From c2ff9b64ef080f9072e051789903c5bba834b8b9 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 12 Dec 2023 11:11:14 -0600 Subject: [PATCH 4/6] Fixed the mdbook checker versions --- book/lace_preprocess_mdbook_yaml/Cargo.lock | 10 +++++----- book/lace_preprocess_mdbook_yaml/Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/book/lace_preprocess_mdbook_yaml/Cargo.lock b/book/lace_preprocess_mdbook_yaml/Cargo.lock index 98b3f608..ab820025 100644 --- a/book/lace_preprocess_mdbook_yaml/Cargo.lock +++ b/book/lace_preprocess_mdbook_yaml/Cargo.lock @@ -1032,7 +1032,7 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.3.0" +version = "0.4.0" dependencies = [ "flate2", "lace_consts", @@ -1050,14 +1050,14 @@ dependencies = [ [[package]] name = "lace_consts" -version = "0.1.4" +version = "0.2.0" dependencies = [ "rv", ] [[package]] name = "lace_data" -version = "0.1.2" +version = "0.2.0" dependencies = [ "lace_utils", "regex", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.1.5" +version = "0.2.0" dependencies = [ "itertools", "lace_consts", @@ -1102,7 +1102,7 @@ dependencies = [ [[package]] name = "lace_utils" -version = "0.1.2" +version = "0.2.0" dependencies = [ "rand", ] diff --git a/book/lace_preprocess_mdbook_yaml/Cargo.toml b/book/lace_preprocess_mdbook_yaml/Cargo.toml index c80156ac..c35ba3c8 100644 --- a/book/lace_preprocess_mdbook_yaml/Cargo.toml +++ b/book/lace_preprocess_mdbook_yaml/Cargo.toml @@ -16,8 +16,8 @@ path = "src/main.rs" anyhow = "1.0" clap = "4.2" env_logger = "0.10" -lace_codebook = { path = "../../lace/lace_codebook", version = "0.3.0" } -lace_stats = { path = "../../lace/lace_stats", version = "0.1.5" } +lace_codebook = { path = "../../lace/lace_codebook", version = "0.4.0" } +lace_stats = { path = "../../lace/lace_stats", version = "0.2.0" } log = "0.4" mdbook = "0.4" pulldown-cmark = { version = "0.9", default-features = false } From 1d2c6fc5fda4c27b0231dcdb775d9e7b6e053f78 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 12 Dec 2023 11:43:21 -0600 Subject: [PATCH 5/6] Some Citation checking changes Changed the CITATION check to only run on release pushes Added a check to make sure the `date-released` field gets updated from the last release Restored the prior date-released in the CITATION.cff --- .github/workflows/citation.yaml | 24 ++++++++++++++++++------ CITATION.cff | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/citation.yaml b/.github/workflows/citation.yaml index 86a2b884..6455a028 100644 --- a/.github/workflows/citation.yaml +++ b/.github/workflows/citation.yaml @@ -2,10 +2,10 @@ name: 'Check CITATION.cff for correct format' on: workflow_dispatch: - pull_request: - paths: - - CITATION.cff - - lace/Cargo.toml + push: + tags: + - rust-* + - python-* jobs: Validate-CITATION-cff: @@ -15,13 +15,25 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Validate CITATION.cff uses: dieghernan/cff-validator@v3 - - - name: Verify CITATION.cff version field + + - name: Install Python dependencies run: | pip install cffconvert yq + + - name: Verify CITATION.cff version field + run: | CITATION_VERSION=$(cffconvert -f schema.org | jq -r .version) LACE_VERSION=$(tomlq -r .package.version lace/Cargo.toml) test "$CITATION_VERSION" = "$LACE_VERSION" + + - name: Verify CITATION.cff date field + run: | + LAST_RELEASE=$(git describe --abbrev=0 --match="rust-*" --match="python-*" HEAD) + LAST_RELEASE_DATE=$(git cat-file -p $LAST_RELEASE:CITATION.cff | cffconvert -f schema.org | jq -r .datePublished) + CURRENT_RELEASE_DATE=$(cffconvert -f schema.org | jq -r .datePublished) + [[ "$BAR" > "$FOO" ]] diff --git a/CITATION.cff b/CITATION.cff index 7ccca7cf..35972272 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -35,4 +35,4 @@ keywords: - Machine Learning license: BUSL-1.1 version: 0.5.1 -date-released: UNKNOWN +date-released: '2023-11-17' From d44c46d4379b54b7684f577dd7713ac0a90b70a6 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 12 Dec 2023 15:09:10 -0600 Subject: [PATCH 6/6] Restored the correct CHANGELOG --- CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0b576b0..0ab854d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [python-0.5.1] - UNKNOWN - -### Changed - -- Updated all packages to have the correct SPDX for the Business Source License - -## [rust-0.5.1] - UNKNOWN - ### Changed - Updated all packages to have the correct SPDX for the Business Source License