From 42a66f62b90957405cb2a4027c378ef1c2f8dbf1 Mon Sep 17 00:00:00 2001 From: Tpt Date: Thu, 4 Jan 2024 15:31:28 +0100 Subject: [PATCH] Enables cargo semver-checks again --- .github/workflows/tests.yml | 6 +++++- Cargo.lock | 12 ++++++------ Cargo.toml | 8 +------- cli/Cargo.toml | 12 ++++++------ js/Cargo.toml | 12 ++++++------ lib/Cargo.toml | 18 +++++++++--------- lib/oxrdf/Cargo.toml | 11 +++++------ lib/oxrdfio/Cargo.toml | 9 ++++----- lib/oxrdfxml/Cargo.toml | 9 ++++----- lib/oxsdatatypes/Cargo.toml | 9 ++++----- lib/oxttl/Cargo.toml | 9 ++++----- lib/sparesults/Cargo.toml | 11 +++++------ lib/spargebra/Cargo.toml | 11 +++++------ lib/sparopt/Cargo.toml | 13 ++++++------- lib/sparql-smith/Cargo.toml | 9 ++++----- oxrocksdb-sys/Cargo.toml | 8 ++++---- python/Cargo.toml | 12 ++++++------ testsuite/Cargo.toml | 18 +++++++++--------- 18 files changed, 93 insertions(+), 104 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e7401054..67153706 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -109,13 +109,17 @@ jobs: semver_checks: runs-on: ubuntu-latest - if: false steps: - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/setup-rust - run: cargo install cargo-semver-checks || true + - uses: actions/cache@v3 + with: + path: rocksdb + key: ${{ runner.os }}-rocksdb-8.0.0 + - run: bash .github/workflows/install_rocksdb.sh - run: cargo semver-checks check-release --exclude oxrocksdb-sys --exclude oxigraph-js --exclude pyoxigraph --exclude oxigraph-testsuite --exclude oxigraph-cli test_linux_x86_64: diff --git a/Cargo.lock b/Cargo.lock index 4a860157..96f7d6fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1033,7 +1033,7 @@ dependencies = [ [[package]] name = "oxigraph" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.2-dev" dependencies = [ "codspeed-criterion-compat", "digest", @@ -1063,7 +1063,7 @@ dependencies = [ [[package]] name = "oxigraph-cli" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.2-dev" dependencies = [ "anyhow", "assert_cmd", @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "oxigraph-js" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.2-dev" dependencies = [ "console_error_panic_hook", "js-sys", @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "oxigraph-testsuite" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.2-dev" dependencies = [ "anyhow", "clap", @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "oxrocksdb-sys" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.2-dev" dependencies = [ "bindgen", "cc", @@ -1403,7 +1403,7 @@ dependencies = [ [[package]] name = "pyoxigraph" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.2-dev" dependencies = [ "oxigraph", "pyo3", diff --git a/Cargo.toml b/Cargo.toml index 1e3a4c68..3ec94c5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,13 +18,7 @@ members = [ ] resolver = "2" -[workspace.package] -version = "0.4.0-alpha.1" -authors = ["Tpt "] -license = "MIT OR Apache-2.0" -homepage = "https://oxigraph.org/" -edition = "2021" -rust-version = "1.70" +# TODO: use workspace.package shared metadata when https://github.com/obi1kenobi/cargo-semver-checks/issues/462 will be fixed [workspace.lints.rust] absolute_paths_not_starting_with_crate = "warn" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4faf1d55..6953a318 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "oxigraph-cli" -version.workspace = true -authors.workspace = true -license.workspace = true +version = "0.4.0-alpha.2-dev" +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["RDF", "SPARQL", "graph-database", "database"] categories = ["command-line-utilities", "database"] @@ -11,8 +11,8 @@ homepage = "https://oxigraph.org/cli/" description = """ Oxigraph command line toolkit and SPARQL HTTP server """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [[bin]] name = "oxigraph" @@ -29,7 +29,7 @@ rustls-webpki = ["oxigraph/http-client-rustls-webpki"] anyhow = "1.0.72" oxhttp = { version = "0.2.0-alpha.3", features = ["flate2"] } clap = { version = "4.0", features = ["derive"] } -oxigraph = { version = "0.4.0-alpha.1", path = "../lib" } +oxigraph = { version = "0.4.0-alpha.2-dev", path = "../lib" } rand = "0.8" url = "2.4" oxiri = "0.2.3-alpha.1" diff --git a/js/Cargo.toml b/js/Cargo.toml index db53f10f..727b15f7 100644 --- a/js/Cargo.toml +++ b/js/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "oxigraph-js" -version.workspace = true -authors.workspace = true -license.workspace = true +version = "0.4.0-alpha.2-dev" +authors = ["Tpt "] +license = "MIT OR Apache-2.0" 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.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" publish = false [lib] @@ -16,7 +16,7 @@ crate-type = ["cdylib"] name = "oxigraph" [dependencies] -oxigraph = { version = "0.4.0-alpha.1", path="../lib", features = ["js"] } +oxigraph = { path = "../lib", features = ["js"] } wasm-bindgen = "0.2.83" js-sys = "0.3.60" console_error_panic_hook = "0.1.7" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 8d120326..9ea03887 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "oxigraph" -version.workspace = true -authors.workspace = true -license.workspace = true +version = "0.4.0-alpha.2-dev" +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["RDF", "SPARQL", "graph-database", "database"] categories = ["database-implementations"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib" -homepage.workspace = true +homepage = "https://oxigraph.org/" documentation = "https://docs.rs/oxigraph" description = """ a SPARQL database and RDF toolkit """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] @@ -34,7 +34,7 @@ oxilangtag = "0.1" oxiri = "0.2.3-alpha.1" oxrdf = { version = "0.2.0-alpha.1", path = "oxrdf", features = ["rdf-star", "oxsdatatypes"] } oxrdfio = { version = "0.1.0-alpha.1", path = "oxrdfio", features = ["rdf-star"] } -oxsdatatypes = { version = "0.2.0-alpha.1", path="oxsdatatypes" } +oxsdatatypes = { version = "0.2.0-alpha.1", path = "oxsdatatypes" } rand = "0.8" regex = "1.7" sha1 = "0.10" @@ -42,11 +42,11 @@ sha2 = "0.10" siphasher = ">=0.3, <2.0" sparesults = { version = "0.2.0-alpha.1", path = "sparesults", features = ["rdf-star"] } spargebra = { version = "0.3.0-alpha.1", path = "spargebra", features = ["rdf-star", "sep-0002", "sep-0006"] } -sparopt = { version = "0.1.0-alpha.1", path="sparopt", features = ["rdf-star", "sep-0002", "sep-0006"] } +sparopt = { version = "0.1.0-alpha.1", path = "sparopt", features = ["rdf-star", "sep-0002", "sep-0006"] } [target.'cfg(not(target_family = "wasm"))'.dependencies] libc = "0.2.147" -oxrocksdb-sys = { version = "0.4.0-alpha.1", path="../oxrocksdb-sys" } +oxrocksdb-sys = { version = "0.4.0-alpha.2-dev", path = "../oxrocksdb-sys" } oxhttp = { version = "0.2.0-alpha.3", optional = true } [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies] diff --git a/lib/oxrdf/Cargo.toml b/lib/oxrdf/Cargo.toml index d843f5d5..fdf94a51 100644 --- a/lib/oxrdf/Cargo.toml +++ b/lib/oxrdf/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "oxrdf" version = "0.2.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/oxrdf" -homepage.workspace = true description = """ A library providing basic data structures related to RDF """ documentation = "https://docs.rs/oxrdf" -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] @@ -22,7 +21,7 @@ rdf-star = [] rand = "0.8" oxilangtag = "0.1" oxiri = "0.2.3-alpha.1" -oxsdatatypes = { version = "0.2.0-alpha.1", path="../oxsdatatypes", optional = true } +oxsdatatypes = { version = "0.2.0-alpha.1", path = "../oxsdatatypes", optional = true } [lints] workspace = true diff --git a/lib/oxrdfio/Cargo.toml b/lib/oxrdfio/Cargo.toml index 5a8da469..6ded48d6 100644 --- a/lib/oxrdfio/Cargo.toml +++ b/lib/oxrdfio/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "oxrdfio" version = "0.1.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/master/lib/oxrdfxml" -homepage.workspace = true documentation = "https://docs.rs/oxrdfio" description = """ Parser and serializer for various RDF formats """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] diff --git a/lib/oxrdfxml/Cargo.toml b/lib/oxrdfxml/Cargo.toml index adc1ab01..2906ac0e 100644 --- a/lib/oxrdfxml/Cargo.toml +++ b/lib/oxrdfxml/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "oxrdfxml" version = "0.1.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["RDFXML", "XML", "RDF"] repository = "https://github.com/oxigraph/oxigraph/tree/master/lib/oxrdfxml" -homepage.workspace = true description = """ Parser and serializer for the RDF/XML format """ documentation = "https://docs.rs/oxrdfxml" -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] diff --git a/lib/oxsdatatypes/Cargo.toml b/lib/oxsdatatypes/Cargo.toml index 8a0ca7be..f7bc1f31 100644 --- a/lib/oxsdatatypes/Cargo.toml +++ b/lib/oxsdatatypes/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "oxsdatatypes" version = "0.2.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["XSD"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/oxsdatatypes" -homepage.workspace = true description = """ An implementation of some XSD datatypes for SPARQL implementations """ documentation = "https://docs.rs/oxsdatatypes" -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] js = ["js-sys"] diff --git a/lib/oxttl/Cargo.toml b/lib/oxttl/Cargo.toml index de0ee35d..c19cdffe 100644 --- a/lib/oxttl/Cargo.toml +++ b/lib/oxttl/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "oxttl" version = "0.1.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["N-Triples", "N-Quads", "Turtle", "TriG", "N3"] repository = "https://github.com/oxigraph/oxigraph/tree/master/lib/oxttl" -homepage.workspace = true description = """ Parser and serializer for languages related to RDF Turtle (N-Triples, N-Quads, Turtle, TriG and N3) """ documentation = "https://docs.rs/oxttl" -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] diff --git a/lib/sparesults/Cargo.toml b/lib/sparesults/Cargo.toml index 7042102a..0ef5eb23 100644 --- a/lib/sparesults/Cargo.toml +++ b/lib/sparesults/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "sparesults" version = "0.2.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/sparesults" -homepage.workspace = true description = """ SPARQL query results formats parsers and serializers """ documentation = "https://docs.rs/sparesults" -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] @@ -22,7 +21,7 @@ async-tokio = ["dep:tokio", "quick-xml/async-tokio", "json-event-parser/async-to [dependencies] json-event-parser = "0.2.0-alpha.2" memchr = "2.5" -oxrdf = { version = "0.2.0-alpha.1", path="../oxrdf" } +oxrdf = { version = "0.2.0-alpha.1", path = "../oxrdf" } quick-xml = ">=0.29, <0.32" tokio = { version = "1.29", optional = true, features = ["io-util"] } diff --git a/lib/spargebra/Cargo.toml b/lib/spargebra/Cargo.toml index bee08a35..620bb041 100644 --- a/lib/spargebra/Cargo.toml +++ b/lib/spargebra/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "spargebra" version = "0.3.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/spargebra" -homepage.workspace = true documentation = "https://docs.rs/spargebra" description = """ A SPARQL parser """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] @@ -25,7 +24,7 @@ peg = "0.8" rand = "0.8" oxiri = "0.2.3-alpha.1" oxilangtag = "0.1" -oxrdf = { version = "0.2.0-alpha.1", path="../oxrdf" } +oxrdf = { version = "0.2.0-alpha.1", path = "../oxrdf" } [lints] workspace = true diff --git a/lib/sparopt/Cargo.toml b/lib/sparopt/Cargo.toml index 8f07afb7..27698646 100644 --- a/lib/sparopt/Cargo.toml +++ b/lib/sparopt/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "sparopt" version = "0.1.0-alpha.1" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/sparopt" -homepage.workspace = true documentation = "https://docs.rs/sparopt" description = """ A SPARQL optimizer """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] @@ -21,9 +20,9 @@ sep-0002 = ["spargebra/sep-0002"] sep-0006 = ["spargebra/sep-0006"] [dependencies] -oxrdf = { version = "0.2.0-alpha.1", path="../oxrdf" } +oxrdf = { version = "0.2.0-alpha.1", path = "../oxrdf" } rand = "0.8" -spargebra = { version = "0.3.0-alpha.1", path="../spargebra" } +spargebra = { version = "0.3.0-alpha.1", path = "../spargebra" } [lints] workspace = true diff --git a/lib/sparql-smith/Cargo.toml b/lib/sparql-smith/Cargo.toml index 9682bd79..b18b94df 100644 --- a/lib/sparql-smith/Cargo.toml +++ b/lib/sparql-smith/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "sparql-smith" version = "0.1.0-alpha.5" -authors.workspace = true -license.workspace = true +authors = ["Tpt "] +license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["SPARQL"] repository = "https://github.com/oxigraph/oxigraph/tree/main/lib/sparql-smith" -homepage.workspace = true documentation = "https://docs.rs/sparql-smith" description = """ A SPARQL test cases generator """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" [features] default = [] diff --git a/oxrocksdb-sys/Cargo.toml b/oxrocksdb-sys/Cargo.toml index e77bb4cf..c767fb74 100644 --- a/oxrocksdb-sys/Cargo.toml +++ b/oxrocksdb-sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "oxrocksdb-sys" -version.workspace = true -authors.workspace = true +version = "0.4.0-alpha.2-dev" +authors = ["Tpt "] 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.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" build = "build.rs" links = "rocksdb" diff --git a/python/Cargo.toml b/python/Cargo.toml index ef9b5933..4c5607b1 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "pyoxigraph" -version.workspace = true -authors.workspace = true -license.workspace = true +version = "0.4.0-alpha.2-dev" +authors = ["Tpt "] +license = "MIT OR Apache-2.0" 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.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" publish = false [lib] @@ -25,7 +25,7 @@ rocksdb-pkg-config = ["oxigraph/rocksdb-pkg-config"] rustls = ["oxigraph/http-client-rustls-native"] [dependencies] -oxigraph = { version = "0.4.0-alpha.1", path="../lib" } +oxigraph.path = "../lib" pyo3 = { version = "0.20.1", features = ["extension-module"] } [lints] diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml index be1b1ac0..79f6b3da 100644 --- a/testsuite/Cargo.toml +++ b/testsuite/Cargo.toml @@ -1,22 +1,22 @@ [package] name = "oxigraph-testsuite" -version.workspace = true -authors.workspace = true -license.workspace = true +version = "0.4.0-alpha.2-dev" +authors = ["Tpt "] +license = "MIT OR Apache-2.0" description = """ Implementation of W3C testsuites for Oxigraph """ -edition.workspace = true -rust-version.workspace = true +edition = "2021" +rust-version = "1.70" publish = false [dependencies] anyhow = "1.0.72" clap = { version = "4.0", features = ["derive"] } -oxigraph = { path = "../lib" } -oxttl = { path= "../lib/oxttl" } -sparopt = { path = "../lib/sparopt" } -spargebra = { path = "../lib/spargebra" } +oxigraph.path = "../lib" +oxttl.path = "../lib/oxttl" +sparopt.path = "../lib/sparopt" +spargebra.path = "../lib/spargebra" text-diff = "0.4" time = { version = "0.3", features = ["formatting"] }