Skip to content

Commit 2d7b358

Browse files
authored
Merge pull request #27 from dhalbert/build-bundle-no-entering
Simplify parsing git output in build_bundle.
2 parents 6d26530 + 97f95cc commit 2d7b358

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

circuitpython_build_tools/scripts/build_bundles.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ def build_bundle(libs, bundle_version, output_filename,
8181
if multiple_libs:
8282
with open(os.path.join(build_dir, top_folder, "VERSIONS.txt"), "w") as f:
8383
f.write(bundle_version + "\r\n")
84-
versions = subprocess.run('git submodule foreach \"git remote get-url origin && git describe --tags\"', shell=True, stdout=subprocess.PIPE, cwd=os.path.commonpath(libs))
84+
versions = subprocess.run('git submodule --quiet foreach \"git remote get-url origin && git describe --tags\"', shell=True, stdout=subprocess.PIPE, cwd=os.path.commonpath(libs))
8585
if versions.returncode != 0:
8686
print("Failed to generate versions file. Its likely a library hasn't been "
8787
"released yet.")
8888
success = False
8989

9090
repo = None
9191
for line in versions.stdout.split(b"\n"):
92-
if line.startswith(b"Entering") or not line:
92+
if not line:
9393
continue
9494
if line.startswith(b"git@"):
9595
repo = b"https://github.com/" + line.split(b":")[1][:-len(".git")]

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Click
22
semver
3+
wheel

0 commit comments

Comments
 (0)