Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tough: Merge in tough_schema #496

Merged
merged 3 commits into from
Nov 8, 2019
Merged

tough: Merge in tough_schema #496

merged 3 commits into from
Nov 8, 2019

Conversation

iliana
Copy link
Contributor

@iliana iliana commented Nov 8, 2019

This merges tough_schema back into tough as a module instead of as a separate crate.

The primary reason for splitting them out was for tuftool (and other utilities) to not have to include an HTTP client in their dependency set. reqwest is now an optional dependency for tough since #488. tough's default dependency tree was then a subset of tough_schema, so this reason no longer holds.

Less crates to publish to crates.io is always nice. :)

Hosts in my cluster are now running this code and updog operates as expected.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Now that reqwest is an optional dependency of tough, there is no
particular benefit to keeping these crates separate.

This just moves tough_schema into tough::schema, without any cleanup.

Signed-off-by: iliana destroyer of worlds <[email protected]>
Signed-off-by: iliana destroyer of worlds <[email protected]>
Copy link
Member

@jahkeup jahkeup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename and consolidation checks out in my eyes. If it blends, then ship it!

@@ -30,7 +30,6 @@ sha2 = "0.8.0"
snafu = { version = "0.5.0", features = ["backtrace-crate"] }
structopt = "0.3"
tempfile = "3.1.0"
tough_schema = { path = "../updater/tough_schema" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

Copy link
Contributor

@sam-aws sam-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🍦

@iliana iliana merged commit 0fc51ed into develop Nov 8, 2019
@tjkirch tjkirch deleted the recombine-tough branch November 10, 2019 23:50
@iliana iliana added this to the v0.2.0 milestone Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants