Skip to content

rename self.exe attribute#149

Merged
MatthewHambley merged 8 commits intoMetOffice:masterfrom
bblay:rename_exe_attribute
Oct 24, 2022
Merged

rename self.exe attribute#149
MatthewHambley merged 8 commits intoMetOffice:masterfrom
bblay:rename_exe_attribute

Conversation

@bblay
Copy link
Contributor

@bblay bblay commented Oct 6, 2022

Actioning this review comment, self.exe is renamed for better readability.

@bblay bblay mentioned this pull request Oct 6, 2022
MatthewHambley
MatthewHambley previously approved these changes Oct 18, 2022
Copy link
Collaborator

@MatthewHambley MatthewHambley left a comment

Choose a reason for hiding this comment

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

A simple change which improves readability.

# Conflicts:
#	source/fab/steps/compile_fortran.py
Copy link
Collaborator

@MatthewHambley MatthewHambley left a comment

Choose a reason for hiding this comment

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

Noticed an oddity

common_flags = common_flags or []
env_flags = os.getenv('FFLAGS', '').split()
self.exe: str = compiler or os.getenv('FC', 'gfortran -c') # type: ignore
self.compiler: str = compiler or os.getenv('FC', 'gfortran -c') # type: ignore
Copy link
Collaborator

Choose a reason for hiding this comment

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

We seem to have two instances of compiler or os.getenv('FC', 'gfortran -c'), here and line 65. Is that intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's my use of the magic wand merge button again. I did say I would be more vigilant with it's use...sorry!

@bblay bblay requested a review from MatthewHambley October 20, 2022 16:29
MatthewHambley
MatthewHambley previously approved these changes Oct 21, 2022
Copy link
Collaborator

@MatthewHambley MatthewHambley left a comment

Choose a reason for hiding this comment

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

Doubled up compiler determination fixed.

# Conflicts:
#	source/fab/steps/compile_fortran.py
#	source/fab/steps/preprocess.py
Copy link
Collaborator

@MatthewHambley MatthewHambley left a comment

Choose a reason for hiding this comment

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

As noted by the developers, many of the changes originally in this patch have been swept up in others that there isn't much left.

@MatthewHambley MatthewHambley merged commit 48082e5 into MetOffice:master Oct 24, 2022
@bblay bblay deleted the rename_exe_attribute branch October 25, 2022 13:27
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.

2 participants