Skip to content

Commit

Permalink
Merge pull request #156 from promised-ai/bugfix/license-cleanup
Browse files Browse the repository at this point in the history
Bugfix/license cleanup
  • Loading branch information
Swandog authored Dec 12, 2023
2 parents 093e36e + d44c46d commit 35f4a5c
Show file tree
Hide file tree
Showing 23 changed files with 136 additions and 103 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/citation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: 'Check CITATION.cff for correct format'

on:
workflow_dispatch:
push:
tags:
- rust-*
- python-*

jobs:
Validate-CITATION-cff:
runs-on: ubuntu-latest
name: Validate CITATION.cff

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Validate CITATION.cff
uses: dieghernan/cff-validator@v3

- 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" ]]
4 changes: 0 additions & 4 deletions .github/workflows/cli-build-test.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: 'CLI: Build and Test'

on:
push:
branches:
- main
- master
workflow_dispatch:
pull_request:
paths:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/python-build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: 'Python: Build and Test'

on:
push:
branches:
- main
- master
tags:
- python-*
workflow_dispatch:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/rust-build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: 'Rust: Build and Test'

on:
push:
branches:
- main
- master
tags:
- rust-*
workflow_dispatch:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Updated all packages to have the correct SPDX for the Business Source License

## [python-0.5.0] - 2023-11-20

### Added
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ abstract: >-
keywords:
- Bayesian
- Machine Learning
license: BSL-1.1
version: 0.5.0
license: BUSL-1.1
version: 0.5.1
date-released: '2023-11-17'
10 changes: 5 additions & 5 deletions book/lace_preprocess_mdbook_yaml/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions book/lace_preprocess_mdbook_yaml/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }
Expand Down
20 changes: 10 additions & 10 deletions cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
18 changes: 9 additions & 9 deletions lace/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions lace/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
Loading

0 comments on commit 35f4a5c

Please sign in to comment.