From 60f7e2dbf82d4e669237b0ae40afaf952ea1ee25 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Fri, 28 Apr 2017 11:39:41 -0400 Subject: [PATCH 1/5] Specify versions for path dependencies to enable publication --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dfa33405b36..09559b151ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ name = "all" path = "src/tests/all.rs" [dependencies] -s3 = { path = "src/s3" } -migrate = { path = "src/migrate" } +s3 = { path = "src/s3", version = "0.0.1" } +migrate = { path = "src/migrate", version = "0.1.0" } rand = "0.3" time = "0.1" git2 = "0.6.4" From c5c77dd621cac0c50790d751f3b2c139ca42871b Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Fri, 28 Apr 2017 11:49:22 -0400 Subject: [PATCH 2/5] Rename path crates since they need to be published too --- Cargo.toml | 4 ++-- src/migrate/Cargo.toml | 2 +- src/s3/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 09559b151ae..5b9e7977c8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ name = "all" path = "src/tests/all.rs" [dependencies] -s3 = { path = "src/s3", version = "0.0.1" } -migrate = { path = "src/migrate", version = "0.1.0" } +cargo-registry-s3 = { path = "src/s3", version = "0.1.0" } +cargo-registry-migrate = { path = "src/migrate", version = "0.1.0" } rand = "0.3" time = "0.1" git2 = "0.6.4" diff --git a/src/migrate/Cargo.toml b/src/migrate/Cargo.toml index 1934ce7113e..30da5972fbb 100644 --- a/src/migrate/Cargo.toml +++ b/src/migrate/Cargo.toml @@ -1,5 +1,5 @@ [project] -name = "migrate" +name = "cargo-registry-migrate" authors = ["Alex Crichton "] version = "0.1.0" diff --git a/src/s3/Cargo.toml b/src/s3/Cargo.toml index 3fa37589fe3..fd5c74ca03a 100644 --- a/src/s3/Cargo.toml +++ b/src/s3/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "s3" +name = "cargo-registry-s3" version = "0.0.1" authors = [] From 9c6daab0a68d72d0b5c5a6f4c70259ec2a437717 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Fri, 28 Apr 2017 11:49:44 -0400 Subject: [PATCH 3/5] Make s3 crate version be the same and have authors --- src/s3/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s3/Cargo.toml b/src/s3/Cargo.toml index fd5c74ca03a..769cf089374 100644 --- a/src/s3/Cargo.toml +++ b/src/s3/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cargo-registry-s3" -version = "0.0.1" -authors = [] +version = "0.1.0" +authors = ["Alex Crichton "] [lib] From 663ffc7538e0a57db00abed00d14792e9ba965d8 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Fri, 28 Apr 2017 11:52:47 -0400 Subject: [PATCH 4/5] Add license and repo metadata --- Cargo.toml | 2 ++ src/migrate/Cargo.toml | 2 ++ src/s3/Cargo.toml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 5b9e7977c8b..62c70a4dbf9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,8 @@ name = "cargo-registry" authors = ["Alex Crichton "] version = "0.1.0" +license = "MIT/Apache-2.0" +repository = "https://github.com/rust-lang/crates.io" [profile.release] opt-level = 2 diff --git a/src/migrate/Cargo.toml b/src/migrate/Cargo.toml index 30da5972fbb..55f4d3e2088 100644 --- a/src/migrate/Cargo.toml +++ b/src/migrate/Cargo.toml @@ -2,6 +2,8 @@ name = "cargo-registry-migrate" authors = ["Alex Crichton "] version = "0.1.0" +license = "MIT/Apache-2.0" +repository = "https://github.com/rust-lang/crates.io" [lib] name = "migrate" diff --git a/src/s3/Cargo.toml b/src/s3/Cargo.toml index 769cf089374..5593b992d85 100644 --- a/src/s3/Cargo.toml +++ b/src/s3/Cargo.toml @@ -3,6 +3,8 @@ name = "cargo-registry-s3" version = "0.1.0" authors = ["Alex Crichton "] +license = "MIT/Apache-2.0" +repository = "https://github.com/rust-lang/crates.io" [lib] From d83a2b3fc5ff4e05a0609604c10914ea087cf704 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Fri, 28 Apr 2017 22:25:21 -0400 Subject: [PATCH 5/5] Make cargo-registry a workspace --- Cargo.lock | 110 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 + 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 714a645d552..42c2f17eb9b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,48 +1,11 @@ [root] -name = "cargo-registry" +name = "cargo-registry-s3" version = "0.1.0" dependencies = [ - "bufstream 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "civet 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy 0.0.118 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-conditional-get 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-cookie 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-git-http-backend 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-json-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-log-requests 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-middleware 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-router 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-static 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "conduit-test 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "diesel 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "diesel_codegen 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "diesel_full_text_search 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dotenv 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "license-exprs 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "migrate 0.1.0", - "oauth2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "postgres 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "r2d2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "r2d2-diesel 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "r2d2_postgres 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "s3 0.0.1", - "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -104,6 +67,60 @@ name = "byteorder" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "cargo-registry" +version = "0.1.0" +dependencies = [ + "bufstream 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo-registry-migrate 0.1.0", + "cargo-registry-s3 0.1.0", + "chrono 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "civet 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clippy 0.0.118 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-conditional-get 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-cookie 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-git-http-backend 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-json-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-log-requests 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-middleware 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-router 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-static 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "conduit-test 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "diesel 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "diesel_codegen 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "diesel_full_text_search 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dotenv 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "license-exprs 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "oauth2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "postgres 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "r2d2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "r2d2-diesel 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "r2d2_postgres 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cargo-registry-migrate" +version = "0.1.0" +dependencies = [ + "postgres 0.13.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "cargo_metadata" version = "0.1.2" @@ -581,13 +598,6 @@ dependencies = [ "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "migrate" -version = "0.1.0" -dependencies = [ - "postgres 0.13.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "miniz-sys" version = "0.1.9" @@ -856,16 +866,6 @@ name = "rustc-serialize" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "s3" -version = "0.0.1" -dependencies = [ - "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "semver" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 62c70a4dbf9..5dcb3e48603 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,8 @@ version = "0.1.0" license = "MIT/Apache-2.0" repository = "https://github.com/rust-lang/crates.io" +[workspace] + [profile.release] opt-level = 2