Skip to content

Commit

Permalink
Update license referencing and revise package dependencies
Browse files Browse the repository at this point in the history
This commit deletes the independent license file in the third-party calendar package and integrates the relevant license referent into the main LICENSE file. It also revises the dependencies across several packages, including removing 'num-traits' from the base workspace dependency, and updating 'chrono' and 'calendar' packages to workspace mode to centralize version management.
  • Loading branch information
nakashima-hikaru committed Jan 6, 2024
1 parent e5950e6 commit 7cc4d7a
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 61 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

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

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@ version = "0.1.0"
authors = ["Hikaru Nakashima <nakashima.alg57@gmail.com>"]
edition = "2021"
repository = "https://github.com/nakashima-hikaru/qlab"
license = "MIT"
license-file = "LICENSE"
keywords = ["finance"]
categories = ["finance"]

[workspace.dependencies]
num-traits = "0.2.17"
chrono = "0.4.31"

qlab-error = { version = "0.1.0", path = "crates/qlab-error", default-features = false }
qlab-time = { version = "0.1.0", path = "crates/qlab-time", default-features = false }
qlab-termstructure = { version = "0.1.0", path = "crates/qlab-termstructure", default-features = false }
qlab-instrument = { version = "0.1.0", path = "crates/qlab-instrument", default-features = false }
qlab-math = { version = "0.1.0", path = "crates/qlab-math", default-features = false }

calendar = { version = "0.1.0", path = "third-parties/calendar", default-features = false }


[workspace.lints.rust]
unsafe_code = "forbid"

Expand Down
27 changes: 27 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,30 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

The externally maintained library from which parts of the Software is derived
is:
- finquant, licensed as follows:
"""
MIT License

Copyright (c) 2023 Jeremy Wang

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
"""
2 changes: 1 addition & 1 deletion crates/qlab-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
Expand Down
2 changes: 1 addition & 1 deletion crates/qlab-instrument/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
Expand Down
2 changes: 1 addition & 1 deletion crates/qlab-math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
Expand Down
2 changes: 1 addition & 1 deletion crates/qlab-termstructure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
Expand Down
4 changes: 2 additions & 2 deletions crates/qlab-time/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
description = "Time related code for the qlab"

[dependencies]
qlab-error = { workspace = true }
chrono = "0.4.31"
chrono = { workspace = true }
num-traits = { workspace = true }
calendar = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/qlab/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
Expand Down
7 changes: 3 additions & 4 deletions third-parties/calendar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
license-file.workspace = true
keywords.workspace = true
categories.workspace = true
readme = "../../README.md"
description = "Time related code for the qlab"
license-file = "LICENSE"
description = "Business days library"

[dependencies]
chrono = "0.4.31"
num-traits = { workspace = true }
chrono = { workspace = true }
48 changes: 0 additions & 48 deletions third-parties/calendar/LICENSE

This file was deleted.

0 comments on commit 7cc4d7a

Please sign in to comment.