feat: Update, remain, and consolidate workspace dependencies (5e8b5794) · Commits · Research Enablement / Xylem

Cargo.lock

+5 −106

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ dependencies = [
		"polling 2.8.0",
		"rustix 0.37.27",
		"slab",
		"socket2 0.4.10",
		"socket2",
		"waker-fn",
		]

		@@ -423,12 +423,6 @@ version = "1.5.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

		[[package]]
		name = "bytes"
		version = "1.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"

		[[package]]
		name = "camino"
		version = "1.1.6"
		@@ -1083,7 +1077,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
		dependencies = [
		"cfg-if 1.0.0",
		"libc",
		"redox_syscall 0.4.1",
		"redox_syscall",
		"windows-sys 0.52.0",
		]

		@@ -1459,7 +1453,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
		dependencies = [
		"bitflags 2.4.2",
		"libc",
		"redox_syscall 0.4.1",
		"redox_syscall",
		]

		[[package]]
		@@ -1484,16 +1478,6 @@ version = "0.4.13"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"

		[[package]]
		name = "lock_api"
		version = "0.4.12"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
		dependencies = [
		"autocfg",
		"scopeguard",
		]

		[[package]]
		name = "log"
		version = "0.4.22"
		@@ -1592,18 +1576,6 @@ dependencies = [
		"winapi 0.2.8",
		]

		[[package]]
		name = "mio"
		version = "1.0.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
		dependencies = [
		"hermit-abi 0.3.9",
		"libc",
		"wasi",
		"windows-sys 0.52.0",
		]

		[[package]]
		name = "mio-extras"
		version = "2.0.6"
		@@ -1612,7 +1584,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
		dependencies = [
		"lazycell",
		"log",
		"mio 0.6.23",
		"mio",
		"slab",
		]

		@@ -1706,7 +1678,7 @@ dependencies = [
		"fsevent-sys",
		"inotify",
		"libc",
		"mio 0.6.23",
		"mio",
		"mio-extras",
		"walkdir",
		"winapi 0.3.9",
		@@ -1834,29 +1806,6 @@ version = "2.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"

		[[package]]
		name = "parking_lot"
		version = "0.12.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
		dependencies = [
		"lock_api",
		"parking_lot_core",
		]

		[[package]]
		name = "parking_lot_core"
		version = "0.9.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
		dependencies = [
		"cfg-if 1.0.0",
		"libc",
		"redox_syscall 0.5.3",
		"smallvec",
		"windows-targets 0.52.4",
		]

		[[package]]
		name = "phf"
		version = "0.11.2"
		@@ -1939,20 +1888,14 @@ dependencies = [
		"clap 4.5.2",
		"clap-verbosity-flag",
		"color-eyre",
		"console",
		"derive_more",
		"dotenvy",
		"env_logger",
		"exitcode",
		"fancy-regex",
		"glob",
		"indicatif",
		"is-terminal",
		"log",
		"nanoid",
		"owo-colors 4.0.0",
		"rayon",
		"regex",
		"serde",
		"serde_json",
		"serde_yml",
		@@ -2120,15 +2063,6 @@ dependencies = [
		"bitflags 1.3.2",
		]

		[[package]]
		name = "redox_syscall"
		version = "0.5.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
		dependencies = [
		"bitflags 2.4.2",
		]

		[[package]]
		name = "redox_users"
		version = "0.4.4"
		@@ -2232,12 +2166,6 @@ dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "scopeguard"
		version = "1.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

		[[package]]
		name = "semver"
		version = "1.0.22"
		@@ -2371,16 +2299,6 @@ dependencies = [
		"winapi 0.3.9",
		]

		[[package]]
		name = "socket2"
		version = "0.5.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
		dependencies = [
		"libc",
		"windows-sys 0.52.0",
		]

		[[package]]
		name = "static_assertions"
		version = "1.1.0"
		@@ -2549,26 +2467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
		dependencies = [
		"backtrace",
		"bytes",
		"libc",
		"mio 1.0.2",
		"parking_lot",
		"pin-project-lite",
		"signal-hook-registry",
		"socket2 0.5.7",
		"tokio-macros",
		"windows-sys 0.52.0",
		]

		[[package]]
		name = "tokio-macros"
		version = "2.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn 2.0.76",
		]

		[[package]]

Cargo.toml

+14 −1

Original line number	Diff line number	Diff line
		@@ -11,5 +11,18 @@ readme = "README.md"
		homepage = "https://pipe.ornl.gov"
		repository = "https://code.ornl.gov/GSHS/common/pipe/command"

		[workspace.dependencies]
		clap-verbosity-flag = "2.2.0"
		color-eyre = "0.6.3"
		dotenvy = "0.15.0"
		exitcode = "1.1.2"
		rayon = "1.7.0"
		serde = { version = "1.0.188", features = ["derive"] }
		serde_json = "1.0.107"
		tracing = { version = "0.1.40" }
		tracing-log = "0.2.0"
		tracing-subscriber = { version = "0.3.18", features = ["env-filter"]}
		uriparse = "0.6.4"

		[profile.release]
		debug = true

lcov.info

+56 −56

Original line number	Diff line number	Diff line
		@@ -108,110 +108,109 @@ LH:0
		end_of_record
		TN:
		SF:/root/dev/command/pipe-cli/src/commands/run/mod.rs
		FN:15,run
		FN:16,run
		FNF:1
		FNDA:0,run
		DA:15,0
		DA:22,0
		DA:16,0
		DA:23,0
		DA:24,0
		DA:26,0
		DA:25,0
		DA:27,0
		DA:29,0
		DA:31,0
		DA:28,0
		DA:30,0
		DA:32,0
		DA:33,0
		DA:35,0
		DA:34,0
		DA:36,0
		DA:38,0
		DA:37,0
		DA:39,0
		DA:40,0
		DA:43,0
		DA:41,0
		DA:44,0
		DA:46,0
		DA:45,0
		DA:47,0
		DA:48,0
		DA:49,0
		DA:50,0
		DA:54,0
		DA:51,0
		DA:55,0
		DA:56,0
		DA:58,0
		DA:57,0
		DA:59,0
		DA:64,0
		DA:66,0
		DA:68,0
		DA:70,0
		DA:60,0
		DA:65,0
		DA:67,0
		DA:69,0
		DA:71,0
		DA:74,0
		DA:72,0
		DA:75,0
		DA:76,0
		DA:79,0
		DA:81,0
		DA:77,0
		DA:80,0
		DA:82,0
		DA:83,0
		DA:85,0
		DA:88,0
		DA:84,0
		DA:86,0
		DA:89,0
		DA:91,0
		DA:90,0
		DA:92,0
		DA:94,0
		DA:93,0
		DA:95,0
		DA:96,0
		DA:97,0
		DA:98,0
		DA:99,0
		DA:101,0
		DA:105,0
		DA:100,0
		DA:102,0
		DA:106,0
		DA:107,0
		DA:108,0
		DA:110,0
		DA:114,0
		DA:116,0
		DA:118,0
		DA:109,0
		DA:111,0
		DA:115,0
		DA:117,0
		DA:119,0
		DA:121,0
		DA:120,0
		DA:122,0
		DA:123,0
		DA:124,0
		DA:126,0
		DA:131,0
		DA:125,0
		DA:127,0
		DA:132,0
		DA:133,0
		DA:136,0
		DA:138,0
		DA:140,0
		DA:143,0
		DA:145,0
		DA:147,0
		DA:134,0
		DA:137,0
		DA:139,0
		DA:141,0
		DA:144,0
		DA:146,0
		DA:148,0
		DA:149,0
		DA:151,0
		DA:153,0
		DA:155,0
		DA:150,0
		DA:152,0
		DA:154,0
		DA:156,0
		DA:157,0
		DA:158,0
		DA:160,0
		DA:159,0
		DA:161,0
		DA:162,0
		DA:165,0
		DA:163,0
		DA:166,0
		DA:169,0
		DA:167,0
		DA:170,0
		DA:171,0
		DA:174,0
		DA:176,0
		DA:172,0
		DA:175,0
		DA:177,0
		DA:180,0
		DA:178,0
		DA:181,0
		DA:185,0
		DA:182,0
		DA:186,0
		DA:187,0
		DA:188,0
		DA:189,0
		DA:192,0
		DA:190,0
		DA:193,0
		DA:194,0
		DA:195,0
		@@ -222,13 +221,14 @@ DA:199,0
		DA:200,0
		DA:201,0
		DA:202,0
		DA:204,0
		DA:207,0
		DA:210,0
		DA:213,0
		DA:215,0
		DA:218,0
		DA:220,0
		DA:203,0
		DA:205,0
		DA:208,0
		DA:211,0
		DA:214,0
		DA:216,0
		DA:219,0
		DA:221,0
		LF:118
		LH:0
		end_of_record

pipe-cli/Cargo.toml

+11 −11

Original line number	Diff line number	Diff line
		@@ -9,21 +9,21 @@ edition = "2021"
		[dependencies]
		pipe-lib = { path = "../pipe-lib" }
		clap = { version = "4.4.2", features = ["derive"] }
		clap-verbosity-flag = "2.2.0"
		color-eyre = "0.6.3"
		console = { version = "0.15.7", default-features = false, features = ["ansi-parsing"] }
		dotenvy = "0.15.0"
		exitcode = "1.1.2"
		glob = "0.3.1"
		indicatif = "0.17.6"
		nanoid = "0.4.0"
		rayon = "1.7.0"
		serde = { version = "1.0.188", features = ["derive"] }
		serde_json = "1.0.107"
		tracing = { version = "0.1.40" }
		tracing-log = "0.2.0"
		tracing-subscriber = { version = "0.3.18", features = ["env-filter"]}
		uriparse = "0.6.4"
		clap-verbosity-flag = { workspace = true }
		color-eyre = { workspace = true }
		dotenvy = { workspace = true }
		exitcode = { workspace = true }
		rayon = { workspace = true }
		serde = { workspace = true }
		serde_json = { workspace = true }
		tracing = { workspace = true }
		tracing-log = { workspace = true }
		tracing-subscriber = { workspace = true }
		uriparse = { workspace = true }

		[dev-dependencies]
		cargo-watch = "8.4.1"

pipe-cli/src/commands/run/mod.rs

+1 −0

Original line number	Diff line number	Diff line
		use clap_verbosity_flag::Verbosity;
		use color_eyre::eyre::Report;
		use exitcode;
		use nanoid::nanoid;
		use pipe_lib::{
		get_conda_environment_name, Command, Config, EnvironmentValue, Label, ModuleLanguage, ModuleType, ModuleUri, Script, TemplateAttribute,