Skip to content

Commit

Permalink
Bump Janus crate versions to 0.4.0 (#1141)
Browse files Browse the repository at this point in the history
* bump to 0.3.1 and work around cargo publish issue (#992)

* bump crate versions to 0.3.1

* workaround for cargo dev-dependencies problem

To work around a known issue with `cargo publish` ([1]), update all
self-dependencies under dev-dependencies to use `path = "."` instead of
a versioned crate, as `publish` insists on fetching from crates.io,
despite a correctly versioned crate being available locally.

[1]: rust-lang/cargo#4242

* Bump Janus crate versions to 0.4.0

* Fix more self-dev-dependencies

As in PR#992, we work around a `cargo publish` issue.
  • Loading branch information
tgeoghegan authored Mar 22, 2023
1 parent 00be66d commit 079a603
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
16 changes: 8 additions & 8 deletions 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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ homepage = "https://divviup.org"
license = "MPL-2.0"
repository = "https://github.com/divviup/janus"
rust-version = "1.65.0"
version = "0.3.0"
version = "0.4.0"

[workspace.dependencies]
# Disable default features to disable compatibility with the old `time` crate, and we also don't
# (yet) need other default features.
# https://docs.rs/chrono/latest/chrono/#duration
chrono = { version = "0.4", default-features = false }
janus_aggregator = { version = "0.3", path = "aggregator" }
janus_aggregator_core = { version = "0.3", path = "aggregator_core" }
janus_build_script_utils = { version = "0.3", path = "build_script_utils" }
janus_client = { version = "0.3", path = "client" }
janus_collector = { version = "0.3", path = "collector" }
janus_core = { version = "0.3", path = "core" }
janus_integration_tests = { version = "0.3", path = "integration_tests" }
janus_interop_binaries = { version = "0.3", path = "interop_binaries" }
janus_messages = { version = "0.3", path = "messages" }
janus_aggregator = { version = "0.4", path = "aggregator" }
janus_aggregator_core = { version = "0.4", path = "aggregator_core" }
janus_build_script_utils = { version = "0.4", path = "build_script_utils" }
janus_client = { version = "0.4", path = "client" }
janus_collector = { version = "0.4", path = "collector" }
janus_core = { version = "0.4", path = "core" }
janus_integration_tests = { version = "0.4", path = "integration_tests" }
janus_interop_binaries = { version = "0.4", path = "interop_binaries" }
janus_messages = { version = "0.4", path = "messages" }
k8s-openapi = { version = "0.16.0", features = ["v1_24"] } # keep this version in sync with what is referenced by the indirect dependency via `kube`
kube = { version = "0.75.0", default-features = false, features = ["client"] }
prio = { version = "0.12.0", features = ["multithreaded"] }
Expand Down
2 changes: 1 addition & 1 deletion aggregator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ itertools = "0.10.5"
# lack of support for connecting to servers by IP addresses, which affects many
# Kubernetes clusters. Enable the `test-util` feature for various utilities
# used in unit tests.
janus_aggregator = { workspace = true, features = ["fpvec_bounded_l2", "kube-openssl", "test-util"] }
janus_aggregator = { path = ".", features = ["fpvec_bounded_l2", "kube-openssl", "test-util"] }
janus_aggregator_core = { workspace = true, features = ["test-util"] }
mockito = "1.0.0"
tempfile = "3.4.0"
Expand Down
2 changes: 1 addition & 1 deletion aggregator_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ uuid = { version = "1.3.0", features = ["v4"] }
[dev-dependencies]
assert_matches = "1"
hyper = "0.14.25"
janus_aggregator_core = { workspace = true, features = ["test-util"] }
janus_aggregator_core = { path = ".", features = ["test-util"] }
janus_core = { workspace = true, features = ["test-util"] }
serde_test = "1.0.158"
tempfile = "3.4.0"
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tracing-subscriber = { version = "0.3", features = ["std", "env-filter", "fmt"],
[dev-dependencies]
fixed = "1.23"
hex = { version = "0.4", features = ["serde"] } # ensure this remains compatible with the non-dev dependency
janus_core = { workspace = true, features = ["test-util"] }
janus_core = { path = ".", features = ["test-util"] }
# Enable `kube`'s `openssl-tls` feature (which takes precedence over the
# `rustls-tls` feature when creating a default client) to work around rustls's
# lack of support for connecting to servers by IP addresses, which affects many
Expand Down

0 comments on commit 079a603

Please sign in to comment.