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

[utils] Fix share dir when running from repo clone #575

Merged
merged 1 commit into from
Sep 17, 2021

Conversation

relrod
Copy link
Member

@relrod relrod commented Sep 17, 2021

Change:

  • Adopt src code layout #562 broke people who run navigator from a clone of the repository
    without installing it somewhere. The search path for the share
    directory starts with looking for it relative to utils.py for exactly
    this scenario. However when the ansible_navigator directory got moved
    a level deeper, this path wasn't updated.

Test Plan:

  • Ran ansible-navigator from git clone after pip uninstalling it.

Signed-off-by: Rick Elrod rick@elrod.me

@relrod relrod requested review from webknjaz, cidrblock and a team September 17, 2021 15:17
Change:
- ansible#562 broke people who run navigator from a clone of the repository
  without installing it somewhere. The search path for the share
  directory starts with looking for it relative to utils.py for exactly
  this scenario. However when the ansible_navigator directory got moved
  a level deeper, this path wasn't updated.

Test Plan:
- Ran ansible-navigator from git clone after pip uninstalling it.

Signed-off-by: Rick Elrod <rick@elrod.me>
relrod added a commit to relrod/winston that referenced this pull request Sep 17, 2021
Change:
- It was impossible to run ansible-navigator or ansible-lint or some
  other things from within src/ansible_navigator due to the conflicting
  yaml.py filename. This is just a simple rename since yaml is a
  commonly used library.

Test Plan:
- Ran ansible-navigator locally (with change from ansible#575)

Signed-off-by: Rick Elrod <rick@elrod.me>
@relrod
Copy link
Member Author

relrod commented Sep 17, 2021

recheck

@relrod relrod added the gate label Sep 17, 2021
Copy link
Contributor

@ansible-zuul ansible-zuul bot left a comment

Choose a reason for hiding this comment

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

LGTM!

@ansible-zuul ansible-zuul bot merged commit 16939d2 into ansible:main Sep 17, 2021
ansible-zuul bot pushed a commit that referenced this pull request Sep 17, 2021
[yaml] Rename yaml to _yaml to prevent conflicts

Change:

It was impossible to run ansible-navigator or ansible-lint or some
other things from within src/ansible_navigator due to the conflicting
yaml.py filename. This is just a simple rename since yaml is a
commonly used library.

Test Plan:

Ran ansible-navigator locally (with change from #575)

Signed-off-by: Rick Elrod rick@elrod.me

Reviewed-by: Sviatoslav Sydorenko <webknjaz+github/profile@redhat.com>
Reviewed-by: None <None>
Spredzy pushed a commit to Spredzy/ansible-navigator that referenced this pull request Oct 6, 2021
[utils] Fix share dir when running from repo clone

Change:

ansible#562 broke people who run navigator from a clone of the repository
without installing it somewhere. The search path for the share
directory starts with looking for it relative to utils.py for exactly
this scenario. However when the ansible_navigator directory got moved
a level deeper, this path wasn't updated.

Test Plan:

Ran ansible-navigator from git clone after pip uninstalling it.

Signed-off-by: Rick Elrod rick@elrod.me

Reviewed-by: Sviatoslav Sydorenko <webknjaz+github/profile@redhat.com>
Reviewed-by: None <None>
(cherry picked from commit 16939d2)
Spredzy pushed a commit to Spredzy/ansible-navigator that referenced this pull request Oct 6, 2021
[yaml] Rename yaml to _yaml to prevent conflicts

Change:

It was impossible to run ansible-navigator or ansible-lint or some
other things from within src/ansible_navigator due to the conflicting
yaml.py filename. This is just a simple rename since yaml is a
commonly used library.

Test Plan:

Ran ansible-navigator locally (with change from ansible#575)

Signed-off-by: Rick Elrod rick@elrod.me

Reviewed-by: Sviatoslav Sydorenko <webknjaz+github/profile@redhat.com>
Reviewed-by: None <None>
(cherry picked from commit 0918b3c)
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.

None yet

2 participants