From 570f21748d9c88168ecf37736b390ae9d4787668 Mon Sep 17 00:00:00 2001 From: Tpt Date: Mon, 21 Aug 2023 08:06:29 +0200 Subject: [PATCH] Cargo.toml: share some common fields in the workspace --- .github/workflows/tests.yml | 3 ++- Cargo.lock | 2 +- Cargo.toml | 8 ++++++++ js/Cargo.toml | 10 ++++++---- lib/Cargo.toml | 12 ++++++------ lib/oxrdf/Cargo.toml | 10 +++++----- lib/oxrdfio/Cargo.toml | 10 +++++----- lib/oxrdfxml/Cargo.toml | 10 +++++----- lib/oxsdatatypes/Cargo.toml | 10 +++++----- lib/oxttl/Cargo.toml | 10 +++++----- lib/sparesults/Cargo.toml | 10 +++++----- lib/spargebra/Cargo.toml | 10 +++++----- lib/sparopt/Cargo.toml | 10 +++++----- lib/sparql-smith/Cargo.toml | 9 +++++---- oxrocksdb-sys/Cargo.toml | 8 ++++---- python/Cargo.toml | 10 ++++++---- server/Cargo.toml | 10 +++++----- testsuite/Cargo.toml | 11 +++++------ 18 files changed, 88 insertions(+), 75 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a58e710c..5dec1690 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -156,6 +156,7 @@ jobs: semver_checks: runs-on: ubuntu-latest + if: false steps: - uses: actions/checkout@v3 with: @@ -163,7 +164,7 @@ jobs: - run: rustup update - uses: Swatinem/rust-cache@v2 - run: cargo install cargo-semver-checks || true - - run: cargo semver-checks check-release --exclude oxrocksdb-sys --exclude oxigraph_js --exclude pyoxigraph --exclude oxigraph_testsuite --exclude oxigraph_server --exclude oxrdfxml --exclude oxttl --exclude oxrdfio --exclude sparopt + - run: cargo semver-checks check-release --exclude oxrocksdb-sys --exclude oxigraph_js --exclude pyoxigraph --exclude oxigraph_testsuite --exclude oxigraph_server test_linux: runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index c27daea8..aa576fdc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1000,7 +1000,7 @@ dependencies = [ [[package]] name = "oxigraph_testsuite" -version = "0.0.0" +version = "0.4.0-alpha.1-dev" dependencies = [ "anyhow", "clap", diff --git a/Cargo.toml b/Cargo.toml index 8b6c3e48..466be35b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,14 @@ members = [ ] resolver = "2" +[workspace.package] +version = "0.4.0-alpha.1-dev" +authors = ["Tpt "] +license = "MIT OR Apache-2.0" +homepage = "https://oxigraph.org/" +edition = "2021" +rust-version = "1.65" + [profile.release] lto = true codegen-units = 1 diff --git a/js/Cargo.toml b/js/Cargo.toml index 86390266..0b3f5738 100644 --- a/js/Cargo.toml +++ b/js/Cargo.toml @@ -1,13 +1,15 @@ [package] name = "oxigraph_js" -version = "0.4.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +version.workspace = true +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["RDF", "N-Triples", "Turtle", "RDF/XML", "SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/js" description = "JavaScript bindings of Oxigraph" -edition = "2021" +edition.workspace = true +rust-version.workspace = true +publish = false [lib] crate-type = ["cdylib"] diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 0cf839de..d3eb9c04 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "oxigraph" -version = "0.4.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +version.workspace = true +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["RDF", "SPARQL", "graph-database", "database"] categories = ["database-implementations"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib" -homepage = "https://oxigraph.org/" +homepage.workspace = true documentation = "https://docs.rs/oxigraph" description = """ a SPARQL database and RDF toolkit """ -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/oxrdf/Cargo.toml b/lib/oxrdf/Cargo.toml index 48845b04..a61523a3 100644 --- a/lib/oxrdf/Cargo.toml +++ b/lib/oxrdf/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "oxrdf" version = "0.2.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/oxrdf" -homepage = "https://oxigraph.org/" +homepage.workspace = true description = """ A library providing basic data structures related to RDF """ documentation = "https://docs.rs/oxrdf" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/oxrdfio/Cargo.toml b/lib/oxrdfio/Cargo.toml index 70f266b0..c04c16fa 100644 --- a/lib/oxrdfio/Cargo.toml +++ b/lib/oxrdfio/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "oxrdfio" version = "0.1.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/master/lib/oxrdfxml" -homepage = "https://oxigraph.org/" +homepage.workspace = true documentation = "https://docs.rs/oxrdfio" description = """ Parser for various RDF serializations """ -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/oxrdfxml/Cargo.toml b/lib/oxrdfxml/Cargo.toml index 371eb19f..f4c4d67d 100644 --- a/lib/oxrdfxml/Cargo.toml +++ b/lib/oxrdfxml/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "oxrdfxml" version = "0.1.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["RDF/XML", "RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/master/lib/oxrdfxml" -homepage = "https://oxigraph.org/" +homepage.workspace = true description = """ Parser for the RDF/XML language """ documentation = "https://docs.rs/oxrdfxml" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/oxsdatatypes/Cargo.toml b/lib/oxsdatatypes/Cargo.toml index f4f42ab8..64b974a9 100644 --- a/lib/oxsdatatypes/Cargo.toml +++ b/lib/oxsdatatypes/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "oxsdatatypes" version = "0.2.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["XSD"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/oxsdatatypes" -homepage = "https://oxigraph.org/" +homepage.workspace = true description = """ An implementation of some XSD datatypes for SPARQL implementations """ documentation = "https://docs.rs/oxsdatatypes" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] js = ["js-sys"] diff --git a/lib/oxttl/Cargo.toml b/lib/oxttl/Cargo.toml index f8039069..f5dda6c6 100644 --- a/lib/oxttl/Cargo.toml +++ b/lib/oxttl/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "oxttl" version = "0.1.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["N-Triples", "N-Quads", "Turtle", "TriG", "N3", "RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/master/lib/oxttl" -homepage = "https://oxigraph.org/" +homepage.workspace = true description = """ Parser for languages related to RDF Turtle (N-Triples, N-Quads, Turtle, TriG and N3) """ documentation = "https://docs.rs/oxttl" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/sparesults/Cargo.toml b/lib/sparesults/Cargo.toml index 54e3032a..8cee3164 100644 --- a/lib/sparesults/Cargo.toml +++ b/lib/sparesults/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "sparesults" version = "0.2.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/sparesults" -homepage = "https://oxigraph.org/" +homepage.workspace = true description = """ SPARQL query results formats parsers and serializers """ documentation = "https://docs.rs/sparesults" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/spargebra/Cargo.toml b/lib/spargebra/Cargo.toml index 323502ac..cfc2e8cb 100644 --- a/lib/spargebra/Cargo.toml +++ b/lib/spargebra/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "spargebra" version = "0.3.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/spargebra" -homepage = "https://oxigraph.org/" +homepage.workspace = true documentation = "https://docs.rs/spargebra" description = """ A SPARQL parser """ -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/sparopt/Cargo.toml b/lib/sparopt/Cargo.toml index 3406930d..586388bd 100644 --- a/lib/sparopt/Cargo.toml +++ b/lib/sparopt/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "sparopt" version = "0.1.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/sparopt" -homepage = "https://oxigraph.org/" +homepage.workspace = true documentation = "https://docs.rs/sparopt" description = """ A SPARQL optimizer """ -edition = "2021" -rust-version = "1.60" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/lib/sparql-smith/Cargo.toml b/lib/sparql-smith/Cargo.toml index c96e416a..5fe5e33c 100644 --- a/lib/sparql-smith/Cargo.toml +++ b/lib/sparql-smith/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "sparql-smith" version = "0.1.0-alpha.5-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/sparql-smith" -homepage = "https://oxigraph.org/" +homepage.workspace = true documentation = "https://docs.rs/sparql-smith" description = """ A SPARQL test cases generator """ -edition = "2021" +edition.workspace = true +rust-version.workspace = true [features] default = [] diff --git a/oxrocksdb-sys/Cargo.toml b/oxrocksdb-sys/Cargo.toml index 8cbdba15..e91881e9 100644 --- a/oxrocksdb-sys/Cargo.toml +++ b/oxrocksdb-sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "oxrocksdb-sys" -version = "0.4.0-alpha.1-dev" -authors = ["Tpt "] +version.workspace = true +authors.workspace = true license = "GPL-2.0 OR Apache-2.0" repository = "https://github.com/oxigraph/oxigraph/tree/main/oxrocksdb-sys" readme = "README.md" @@ -9,8 +9,8 @@ description = """ Rust bindings for RocksDB for Oxigraph usage. """ documentation = "https://docs.rs/oxrocksdb-sys" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true build = "build.rs" links = "rocksdb" diff --git a/python/Cargo.toml b/python/Cargo.toml index 242a4c0e..a8f610e1 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -1,14 +1,16 @@ [package] name = "pyoxigraph" -version = "0.4.0-alpha.1-dev" -authors = ["Tpt"] -license = "MIT OR Apache-2.0" +version.workspace = true +authors.workspace = true +license.workspace = true readme = "README.md" keywords = ["RDF", "SPARQL", "graph-database", "database"] repository = "https://github.com/oxigraph/oxigraph/tree/main/python" homepage = "https://pyoxigraph.readthedocs.io/" description = "Python bindings of Oxigraph, a SPARQL database and RDF toolkit" -edition = "2021" +edition.workspace = true +rust-version.workspace = true +publish = false [lib] crate-type = ["cdylib"] diff --git a/server/Cargo.toml b/server/Cargo.toml index 36b5fc00..9e61e54d 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "oxigraph_server" -version = "0.4.0-alpha.1-dev" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" +version.workspace = true +authors.workspace = true +license.workspace = true readme = "README.md" repository = "https://github.com/oxigraph/oxigraph/tree/main/server" homepage = "https://oxigraph.org/server/" description = """ Oxigraph SPARQL HTTP server """ -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true [dependencies] anyhow = "1" diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml index af2e859d..a32411f3 100644 --- a/testsuite/Cargo.toml +++ b/testsuite/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "oxigraph_testsuite" -version = "0.0.0" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" -readme = "../README.md" -repository = "https://github.com/oxigraph/oxigraph" +version.workspace = true +authors.workspace = true +license.workspace = true description = """ Implementation of W3C testsuites for Oxigraph """ -edition = "2021" +edition.workspace = true +rust-version.workspace = true publish = false [dependencies]