From 64959d9ae0ab5bd086ae1e8543e32861d2e96c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 6 Dec 2022 12:18:46 +0100 Subject: [PATCH] move common metadata to workspace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and switch all crates to 2021 edition as well as a unified "authors" value. Signed-off-by: Fabian Grünbichler --- Cargo.toml | 6 ++++++ proxmox-api-macro/Cargo.toml | 9 +++++---- proxmox-async/Cargo.toml | 9 +++++---- proxmox-borrow/Cargo.toml | 9 +++++---- proxmox-compression/Cargo.toml | 9 +++++---- proxmox-http/Cargo.toml | 12 +++++------- proxmox-io/Cargo.toml | 9 +++++---- proxmox-lang/Cargo.toml | 9 +++++---- proxmox-metrics/Cargo.toml | 9 +++++---- proxmox-rest-server/Cargo.toml | 9 +++++---- proxmox-router/Cargo.toml | 9 +++++---- proxmox-schema/Cargo.toml | 9 +++++---- proxmox-section-config/Cargo.toml | 9 +++++---- proxmox-serde/Cargo.toml | 9 +++++---- proxmox-shared-memory/Cargo.toml | 9 +++++---- proxmox-sortable-macro/Cargo.toml | 9 +++++---- proxmox-subscription/Cargo.toml | 9 +++++---- proxmox-sys/Cargo.toml | 9 +++++---- proxmox-tfa/Cargo.toml | 9 +++++---- proxmox-time/Cargo.toml | 9 +++++---- proxmox-uuid/Cargo.toml | 9 +++++---- 21 files changed, 106 insertions(+), 83 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3e4202dd..a92f4a0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,3 +24,9 @@ members = [ exclude = [ "build", ] +[workspace.package] +authors = ["Proxmox Support Team "] +edition = "2021" +license = "AGPL-3" +repository = "https://git.proxmox.com/?p=proxmox.git" +exclude = [ "debian" ] diff --git a/proxmox-api-macro/Cargo.toml b/proxmox-api-macro/Cargo.toml index ab52e0a1..22d45fdf 100644 --- a/proxmox-api-macro/Cargo.toml +++ b/proxmox-api-macro/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-api-macro" -edition = "2018" +edition.workspace = true version = "1.0.3" -authors = [ "Wolfgang Bumiller " ] -license = "AGPL-3" +authors.workspace = true +license.workspace = true +repository.workspace = true description = "Proxmox API macro" -exclude = [ "debian" ] +exclude.workspace = true [lib] proc-macro = true diff --git a/proxmox-async/Cargo.toml b/proxmox-async/Cargo.toml index 8622d4c5..db7ed14f 100644 --- a/proxmox-async/Cargo.toml +++ b/proxmox-async/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-async" version = "0.4.1" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Proxmox async/tokio helpers" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-borrow/Cargo.toml b/proxmox-borrow/Cargo.toml index 802ca7a3..4f4e98a3 100644 --- a/proxmox-borrow/Cargo.toml +++ b/proxmox-borrow/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "proxmox-borrow" version = "1.0.1" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "contains the Tied type to tie a value with a lifetime to the value it borrows from" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] diff --git a/proxmox-compression/Cargo.toml b/proxmox-compression/Cargo.toml index 4acfc393..d863e4a0 100644 --- a/proxmox-compression/Cargo.toml +++ b/proxmox-compression/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-compression" version = "0.1.2" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "contains compression utilitites (such as an Zip Encoder for async rust)" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml index 543aecf1..81520e6a 100644 --- a/proxmox-http/Cargo.toml +++ b/proxmox-http/Cargo.toml @@ -1,15 +1,13 @@ [package] name = "proxmox-http" -edition = "2018" +edition.workspace = true version = "0.7.0" -authors = [ - "Dietmar Maurer ", - "Wolfgang Bumiller ", -] -license = "AGPL-3" +authors.workspace = true +license.workspace = true +repository.workspace = true description = "Proxmox HTTP library" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-io/Cargo.toml b/proxmox-io/Cargo.toml index b973f991..c1194587 100644 --- a/proxmox-io/Cargo.toml +++ b/proxmox-io/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-io" version = "1.0.1" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "extension traits for Read and Write" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] endian_trait = { version = "0.6", features = ["arrays"] } diff --git a/proxmox-lang/Cargo.toml b/proxmox-lang/Cargo.toml index cd7f5751..577dfdbd 100644 --- a/proxmox-lang/Cargo.toml +++ b/proxmox-lang/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "proxmox-lang" version = "1.1.0" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "simple rust language utilities such as try_block, which have no dependencies" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] diff --git a/proxmox-metrics/Cargo.toml b/proxmox-metrics/Cargo.toml index 2a559a99..d6894b98 100644 --- a/proxmox-metrics/Cargo.toml +++ b/proxmox-metrics/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-metrics" version = "0.2.1" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Metrics Server export utilitites" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml index d4b3cc7b..1b63ac91 100644 --- a/proxmox-rest-server/Cargo.toml +++ b/proxmox-rest-server/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-rest-server" version = "0.2.0" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "REST server implementation" -exclude = [ "debian" ] +exclude.workspace = true [dev-dependencies] proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] } diff --git a/proxmox-router/Cargo.toml b/proxmox-router/Cargo.toml index e5ed5e58..69df972c 100644 --- a/proxmox-router/Cargo.toml +++ b/proxmox-router/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-router" version = "1.3.0" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "proxmox API Router and CLI utilities" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-schema/Cargo.toml b/proxmox-schema/Cargo.toml index 8e7adb7d..46508703 100644 --- a/proxmox-schema/Cargo.toml +++ b/proxmox-schema/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-schema" version = "1.3.5" -authors = ["Proxmox Support Team "] -edition = "2021" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "proxmox api schema and validation" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-section-config/Cargo.toml b/proxmox-section-config/Cargo.toml index 74967e1b..86eb5d9a 100644 --- a/proxmox-section-config/Cargo.toml +++ b/proxmox-section-config/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-section-config" version = "1.0.2" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "proxmox schema based section config format parsing" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-serde/Cargo.toml b/proxmox-serde/Cargo.toml index 212a104b..8f388267 100644 --- a/proxmox-serde/Cargo.toml +++ b/proxmox-serde/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-serde" version = "0.1.1" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Serde formatting tools" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-shared-memory/Cargo.toml b/proxmox-shared-memory/Cargo.toml index 096828ba..06d15355 100644 --- a/proxmox-shared-memory/Cargo.toml +++ b/proxmox-shared-memory/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-shared-memory" version = "0.2.2" -authors = ["Dietmar Maurer "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Shared memory helpers and shared mutex implementation" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-sortable-macro/Cargo.toml b/proxmox-sortable-macro/Cargo.toml index 0c516df6..c702c646 100644 --- a/proxmox-sortable-macro/Cargo.toml +++ b/proxmox-sortable-macro/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-sortable-macro" version = "0.1.2" -authors = ["Wolfgang Bumiller "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Proxmox sortable macro" -exclude = [ "debian" ] +exclude.workspace = true [lib] proc-macro = true diff --git a/proxmox-subscription/Cargo.toml b/proxmox-subscription/Cargo.toml index 2be78300..6a42e17e 100644 --- a/proxmox-subscription/Cargo.toml +++ b/proxmox-subscription/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-subscription" version = "0.3.0" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Proxmox subscription utilitites" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-sys/Cargo.toml b/proxmox-sys/Cargo.toml index 6f56f5e4..d38f267a 100644 --- a/proxmox-sys/Cargo.toml +++ b/proxmox-sys/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-sys" version = "0.4.1" -authors = ["Proxmox Support Team "] -edition = "2021" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "System tools (using nix)." -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-tfa/Cargo.toml b/proxmox-tfa/Cargo.toml index 43539dda..e6d781e3 100644 --- a/proxmox-tfa/Cargo.toml +++ b/proxmox-tfa/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-tfa" version = "2.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "tfa implementation for totp and u2f" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-time/Cargo.toml b/proxmox-time/Cargo.toml index e09c2838..59ff86eb 100644 --- a/proxmox-time/Cargo.toml +++ b/proxmox-time/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-time" version = "1.1.4" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "time utilities and TmEditor" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-uuid/Cargo.toml b/proxmox-uuid/Cargo.toml index 1ce0a0e1..c81df384 100644 --- a/proxmox-uuid/Cargo.toml +++ b/proxmox-uuid/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "proxmox-uuid" version = "1.0.1" -authors = ["Proxmox Support Team "] -edition = "2018" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "bindings for libuuid with optional serde support" -exclude = [ "debian" ] +exclude.workspace = true [dependencies] libc = "0.2"