Skip to content

Commit 4c26e17

Browse files
authored
Merge pull request #460 from AVSLab/ci/bsk-458--check-pip-process-returncode
Check pip upgrade return code
2 parents 94f0590 + db0f615 commit 4c26e17

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

conanfile.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,12 @@ def add_basilisk_to_sys_path(self):
299299

300300
process = subprocess.Popen(add_basilisk_module_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
301301
output, err = process.communicate()
302-
if err:
302+
if process.returncode:
303303
print("Error %s while running %s" % (err.decode(), add_basilisk_module_command))
304304
sys.exit(1)
305305
else:
306-
print("This resulted in the output: \n%s" % output.decode())
306+
print("This resulted in the stdout: \n%s" % output.decode())
307+
print("This resulted in the stderr: \n%s" % err.decode())
307308

308309
if __name__ == "__main__":
309310
parser = argparse.ArgumentParser(description="Configure the Basilisk framework.")

docs/source/Support/bskReleaseNotes.rst

+5-3
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ Version |release|
6565
and angular rate (optional) are within the requirement limits and sends an imaging command to a :ref:`simpleInstrument`.
6666
- Added a new scenario :ref:`scenarioHohmann` that performs a Hohmann transfer with attitude mode changes.
6767
The basic attitude flight modes are implemented using the Basilisk event system.
68-
- updated conan support to latest `1.xx` version to provide support for macOS Sonoma
69-
- updated macOS `cspice` library to be compiled with Xcode 15. This addresses some errors that appeared
70-
when calling the prior pre-built `cspice` library. The new library is backwards compatible with
68+
- updated conan support to latest ``1.xx`` version to provide support for macOS Sonoma
69+
- updated macOS ``cspice`` library to be compiled with Xcode 15. This addresses some errors that appeared
70+
when calling the prior pre-built ``cspice`` library. The new library is backwards compatible with
7171
prior versions of Xcode.
72+
- Fixed a bug in the conanfile where the ``stderr`` output from a ``subprocess.Popen`` call was being interpreted as an
73+
error. Rather, the process return code (0 for success, and anything else for failure) indicates the success.
7274

7375

7476
Version 2.2.0 (June 28, 2023)

0 commit comments

Comments
 (0)