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

Update build_board_info.py to sh module 2.0.0 #7564

Merged
merged 1 commit into from
Feb 10, 2023

Conversation

Neradoc
Copy link

@Neradoc Neradoc commented Feb 10, 2023

Due to today's release of the sh python module 2.0.0, the CI fails in build_board_info.py
see https://github.com/adafruit/circuitpython/actions/runs/4140380646

Run python3 -u build_release_files.py
Traceback (most recent call last):
  File "/home/runner/work/circuitpython/circuitpython/tools/build_release_files.py", line 30, in <module>
    sha, version = build_info.get_version_info()
                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/runner/work/circuitpython/circuitpython/tools/build_board_info.py", line 61, in get_version_info
    sha = git("rev-parse", "--short", "HEAD").stdout.decode("utf-8")
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: 'str' object has no attribute 'stdout'
Error: Process completed with exit code 1.

Because it now returns a string:
https://github.com/amoffat/sh/blob/develop/MIGRATION.md#return-value-now-a-true-string
Adabot doesn't seem to need to be updated since it uses the _out = ... argument (with StringIO).

Copy link
Collaborator

@microdev1 microdev1 left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @Neradoc.

@microdev1 microdev1 merged commit e3b924b into adafruit:main Feb 10, 2023
@dhalbert dhalbert added this to the 8.0.x milestone Feb 10, 2023
@dhalbert
Copy link
Collaborator

Tagged for backporting to 8.0.x

@dhalbert
Copy link
Collaborator

Backported to 8.0.x as part of #7566.

@dhalbert dhalbert removed this from the 8.0.x milestone Feb 14, 2023
@Neradoc Neradoc deleted the update-sh-to-2.0.0 branch March 19, 2023 01:26
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.

3 participants