Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

depend-o-pocalipse #9450

Merged
gilescope merged 29 commits into from
Aug 13, 2021
Merged

depend-o-pocalipse #9450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d65cf70
batch1
Jul 28, 2021
0c369a3
batch2
Jul 28, 2021
6c4cc3d
batch3
Jul 28, 2021
209364c
batch4
Jul 28, 2021
47de272
making 3.0.0-dev packages 4.0.0-dev
Jul 28, 2021
f403df9
undo changes
Jul 28, 2021
bbdf293
too aggresive.
gilescope Jul 29, 2021
549def7
undo
gilescope Jul 29, 2021
6a25b85
update the lock file.
gilescope Jul 29, 2021
63e0bbf
Merge remote-tracking branch 'origin/master' into giles-dependopocalipse
gilescope Jul 29, 2021
c01e2cf
Removing commented out deps
gilescope Jul 29, 2021
9771146
Merge branch 'master' into giles-dependopocalipse
gilescope Aug 5, 2021
2bea842
Remove some unused dev dependencies
gilescope Aug 5, 2021
f0a2991
Undo: Keep the PR focused on deps.
gilescope Aug 5, 2021
172e9c6
Merge branch 'master' into giles-dependopocalipse
gilescope Aug 5, 2021
ddb41a1
removed commented out code
gilescope Aug 6, 2021
20094b9
fixed deprecated method
gilescope Aug 6, 2021
54b1411
tracked down test failure.
gilescope Aug 11, 2021
5a2a3b9
Merge branch 'master' into giles-dependopocalipse
gilescope Aug 11, 2021
9a67e3d
cargo fmt
gilescope Aug 11, 2021
36e8903
cargo fmt
gilescope Aug 11, 2021
eb57400
tracing-subscriber needs to be 0.2.19
gilescope Aug 12, 2021
890607b
Removing commented out lines
gilescope Aug 12, 2021
f9d92ce
Don't change crate versions to be consistent
gilescope Aug 13, 2021
ddf496b
Merge branch 'master' into giles-dependopocalipse
gilescope Aug 13, 2021
01498e4
Base lock file off master's Cargo.lock
gilescope Aug 13, 2021
8bddaba
Make test independent of wasm size
gilescope Aug 13, 2021
f94df3c
Correct Typo
gilescope Aug 13, 2021
54b1790
Merge branch 'master' into giles-dependopocalipse
gilescope Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
too aggresive.
  • Loading branch information
@gilescope
gilescope committed Jul 29, 2021
commit bbdf29305520f69d685e67946eb6a75af4e9124d
4 changes: 2 additions & 2 deletions bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../
#sc-offchain = { version = "4.0.0-dev", path = "../../../client/offchain" }
sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
#sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
#sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" }
Expand All @@ -99,7 +99,7 @@ node-primitives = { version = "2.0.0", path = "../primitives" }
#node-executor = { version = "4.0.0-dev", path = "../executor" }

# CLI-specific dependencies
#sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli" }
sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli" }
frame-benchmarking-cli = { version = "4.0.0-dev", optional = true, path = "../../../utils/frame/benchmarking-cli" }
node-inspect = { version = "0.9.0-dev", optional = true, path = "../inspect" }
try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../utils/frame/try-runtime/cli" }
Expand Down
2 changes: 1 addition & 1 deletion frame/support/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ rustversion = "1.0.0"
frame-metadata = { version = "14.0.0-dev", default-features = false, path = "../../metadata" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
# The "std" feature for this pallet is never activated on purpose, in order to test construct_runtime error message
#test-pallet = { package = "frame-support-test-pallet", default-features = false, path = "pallet" }
test-pallet = { package = "frame-support-test-pallet", default-features = false, path = "pallet" }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion frame/uniques/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ default = ["std"]
std = [
"codec/std",
"sp-std/std",
"sp-core/std",
# "sp-core/std",
"sp-runtime/std",
"frame-support/std",
"frame-system/std",
Expand Down
3 changes: 1 addition & 2 deletions primitives/api/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
sp-api = { version = "4.0.0-dev", path = "../" }
#substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
sp-version = { version = "4.0.0-dev", path = "../../version" }
sp-tracing = { version = "4.0.0-dev", path = "../../tracing" }
sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
Expand All @@ -30,7 +30,6 @@ criterion = "0.3.0"
futures = "0.3.9"
log = "0.4.14"
sp-core = { version = "4.0.0-dev", path = "../../core" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }

[[bench]]
name = "bench"
Expand Down