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.

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

PR: Change reporting of macOS system from Darwin to macOS and include machine type #20823

Merged
merged 2 commits into from
Apr 27, 2023
Merged

PR: Change reporting of macOS system from Darwin to macOS and include machine type #20823

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
aff5160
Change reporting of macOS system from Darwin to macOS and include mac…
mrclary Apr 13, 2023
c00227e
Apply review suggestions per @CAM-Gerlach
mrclary Apr 17, 2023
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
12 changes: 9 additions & 3 deletions spyder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def get_versions(reporev=True):
else:
installer = 'pip'

return {
versions = {
'spyder': __version__,
'installer': installer,
'python': platform.python_version(), # "2.7.3"
Expand All @@ -93,8 +93,14 @@ def get_versions(reporev=True):
'system': platform.system(), # Linux, Windows, ...
'release': platform.release(), # XP, 10.6, 2.2.0, etc.
'revision': revision, # '9fdf926eccce',
'branch': branch, # '4.x' or master
'branch': branch, # '4.x' or master,
'machine': platform.machine(), # 'arm64', 'x86_64', 'AMD64', ...
'platform': platform.platform(aliased=True),
}
if sys.platform == 'darwin':
versions.update(system='macOS', release=platform.mac_ver()[0])
mrclary marked this conversation as resolved.
Show resolved Hide resolved

return versions


def get_versions_text(reporev=True):
Expand All @@ -109,5 +115,5 @@ def get_versions_text(reporev=True):
* Python version: {versions['python']} {versions['bitness']}-bit
* Qt version: {versions['qt']}
* {versions['qt_api']} version: {versions['qt_api_ver']}
* Operating System: {versions['system']} {versions['release']}
* Operating System: {versions['platform']}
"""
2 changes: 1 addition & 1 deletion spyder/widgets/about.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __init__(self, parent):
Python {versions['python']} {versions['bitness']}-bit |
Qt {versions['qt']} |
{versions['qt_api']} {versions['qt_api_ver']} |
{versions['system']} {versions['release']}
{versions['system']} {versions['release']} ({versions['machine']})
</p>
<br> <br>
<a href="{project_url}">GitHub</a> | <a href="{twitter_url}">
Expand Down