Skip to content

Fix yaml generator on mac #5186

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 22, 2021
Merged

Fix yaml generator on mac #5186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d97fa39
Fix yaml generator on mac
theopnv Jul 21, 2021
1ec11c5
Let system decide which python binary to call
theopnv Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/_abv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
# Read more under .yamato/docs/readme.md

{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
{% metadata_file .yamato/_cache_config.metafile -%}
{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%}

---
Expand Down
11 changes: 7 additions & 4 deletions .yamato/script/generate_ymls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import subprocess
import ruamel.yaml as yml
import sys

# This script calls the ruamel build.py script, with an argument pointing to current GIT repo
# i.e. when this is called within Graphics repo, then build.py will edit the files in Graphics repo
Expand Down Expand Up @@ -30,16 +31,18 @@
gfx_sdet_tools_dir = config["gfx_sdet_tools_path"]
build_py = os.path.join(gfx_sdet_tools_dir,'yml-generator','ruamel','build.py')

cmd = f'python "{build_py}" --yamato-dir "{current_yamato_dir}"'
print(f'Calling [{cmd}]')

cmd = [sys.executable, build_py,
'--yamato-dir', current_yamato_dir]
print(f'Calling {cmd}')

process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
for stdout_line in iter(process.stdout.readline, ""):
print(stdout_line.strip())
process.stdout.close()
process.wait()

gfx_sdet_tools_rev = subprocess.check_output('git rev-parse HEAD', stderr=subprocess.STDOUT, universal_newlines=True, cwd=gfx_sdet_tools_dir)
gfx_sdet_tools_rev = subprocess.check_output(
['git', 'rev-parse', 'HEAD'], stderr=subprocess.STDOUT, universal_newlines=True, cwd=gfx_sdet_tools_dir)
with open(gfx_sdet_tools_rev_file, 'w') as f:
f.write(gfx_sdet_tools_rev)

Expand Down