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

Improve dependency requirements #1100

Merged
merged 3 commits into from
Sep 1, 2019
Merged

Conversation

swalkinshaw
Copy link
Member

The ultimate purpose of this PR to improve integration with https://github.com/roots/trellis-cli but these changes are worthwhile enough on their own in my opinion.

Two important but small changes:

  1. rename requirements.yml to galaxy.yml. The "requirements" naming is historically for pip dependencies, and since it can be named anything, galaxy.yml makes the most sense since it's only for ansible-galaxy and galaxy packages.
  2. add a proper requirements.txt. It was pretty silly that we never had this anyway. Trellis has dependencies on Ansible (and passlib on macOS) which we only ever talked about in the README and docs. This just codifies them in a requirements.txt which people can use with pip (and virtualenv) if they use it. If they don't, nothing changes anyway.

These changes will also make it possible to trellis-cli to automatically install dependencies.

requirements.txt Outdated Show resolved Hide resolved
@swalkinshaw swalkinshaw marked this pull request as ready for review August 28, 2019 01:49
@swalkinshaw
Copy link
Member Author

@tangrufus does this make sense to you?

@tangrufus
Copy link
Member

tangrufus commented Aug 31, 2019

Looks good to me

Extra: Maybe take this chance to mention $ ansible-galaxy install -r galaxy.yml in the readme?

@swalkinshaw
Copy link
Member Author

We don't mention Galaxy at all on purpose right now since Vagrant takes care of it by default. But I do need to update the real docs eventually.

@swalkinshaw swalkinshaw merged commit cd00a25 into master Sep 1, 2019
@swalkinshaw swalkinshaw deleted the trellis-cli-integration branch September 1, 2019 15:38
knowler added a commit to roots/trellis-cli that referenced this pull request Sep 4, 2019
From `requirements.yml` to `galaxy.yml` as per Trellis v1.1.0
(specifically roots/trellis#1100).
tangrufus added a commit to typisttech/tiller-circleci that referenced this pull request Sep 16, 2019
`requirements.yml` is now `galaxy.yml` as per roots/trellis#1100

Updates references from `requirements.yml` to `galaxy.yml`

Co-authored-by: Tang Rufus <[email protected]>
Co-authored-by: Kelly Mears <[email protected]>
tangrufus added a commit to ItinerisLtd/iroots that referenced this pull request Sep 18, 2019
E-VANCE added a commit to E-VANCE/trellis-backup-during-deploy that referenced this pull request Jan 22, 2020
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.

3 participants