From b2941e963dbcec6b825f1f90fc40528f5a38da8d Mon Sep 17 00:00:00 2001 From: patrick kenneally Date: Wed, 18 Oct 2023 16:22:57 -0600 Subject: [PATCH 1/2] Check pip upgrade return code Characters in stderr don't necessarily mean an error. Rather, a call to process.returncode should check for a success 0, or error code 1 (or otherwise). --- conanfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 08d1e42d95..7dd3d03424 100644 --- a/conanfile.py +++ b/conanfile.py @@ -299,11 +299,12 @@ def add_basilisk_to_sys_path(self): process = subprocess.Popen(add_basilisk_module_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) output, err = process.communicate() - if err: + if process.returncode: print("Error %s while running %s" % (err.decode(), add_basilisk_module_command)) sys.exit(1) else: - print("This resulted in the output: \n%s" % output.decode()) + print("This resulted in the stdout: \n%s" % output.decode()) + print("This resulted in the stderr: \n%s" % err.decode()) if __name__ == "__main__": parser = argparse.ArgumentParser(description="Configure the Basilisk framework.") From db0f6151d74f6b75d14f6a5e309a9412641b7a23 Mon Sep 17 00:00:00 2001 From: patrick kenneally Date: Wed, 18 Oct 2023 16:48:58 -0600 Subject: [PATCH 2/2] Update release notes --- docs/source/Support/bskReleaseNotes.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/source/Support/bskReleaseNotes.rst b/docs/source/Support/bskReleaseNotes.rst index 4f46f04854..91be7190d1 100644 --- a/docs/source/Support/bskReleaseNotes.rst +++ b/docs/source/Support/bskReleaseNotes.rst @@ -65,10 +65,12 @@ Version |release| and angular rate (optional) are within the requirement limits and sends an imaging command to a :ref:`simpleInstrument`. - Added a new scenario :ref:`scenarioHohmann` that performs a Hohmann transfer with attitude mode changes. The basic attitude flight modes are implemented using the Basilisk event system. -- updated conan support to latest `1.xx` version to provide support for macOS Sonoma -- updated macOS `cspice` library to be compiled with Xcode 15. This addresses some errors that appeared - when calling the prior pre-built `cspice` library. The new library is backwards compatible with +- updated conan support to latest ``1.xx`` version to provide support for macOS Sonoma +- updated macOS ``cspice`` library to be compiled with Xcode 15. This addresses some errors that appeared + when calling the prior pre-built ``cspice`` library. The new library is backwards compatible with prior versions of Xcode. +- Fixed a bug in the conanfile where the ``stderr`` output from a ``subprocess.Popen`` call was being interpreted as an + error. Rather, the process return code (0 for success, and anything else for failure) indicates the success. Version 2.2.0 (June 28, 2023)