Liu 338 #220
Merged
Liu 338 #220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…id according to the schema
…ph, it is in the appRef format, which is no longer supported
rtobar
reviewed
Mar 2, 2023
| filename = None | ||
|
|
||
| if filepath: # if there is anything provided | ||
| if filepath.count("/") == 0: # just a name |
There was a problem hiding this comment.
Purely stylistic, but it reads slightly better to the casual reader:
Suggested change
| if filepath.count("/") == 0: # just a name | |
| if "/" not in filepath: # just a name |
| filename = filepath | ||
| dirname = self.get_dir(".") | ||
| # filepath = self.sanitize_paths(self.filepath) | ||
| elif filepath[-1] == "/": # just a directory name |
There was a problem hiding this comment.
Similarly:
Suggested change
| elif filepath[-1] == "/": # just a directory name | |
| elif filepath.endswith("/"): # just a directory name |
| if dirname is None: | ||
| dirname = "." | ||
| filename = os.path.expandvars(filename) if filename else None | ||
| dirname = self.sanitize_paths(dirname) if dirname else None |
There was a problem hiding this comment.
dirname is never None because of the if two lines above
|
Thanks for the comments, have integrated those changes as well as merged with the validate-graphs PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request covers mainly the new treatment of the filepath and removal of the dirname component parameters. filepath is now covering both, by slightly changing the interpretation. That also required changing a number of the test graphs. In fact the update also made the treatment of check_file_path_exists more consistent, since it is now really required to set it to false if it does not exist, which is the case for most of the files generated during a workflow run.
In addition also an import bug in pyfunc.py has been fixed and the setting of the sleepTime when translating in test mode has also been fixed.
The many changes in xml2palette.py are automatic code formatting changes and can be ignored, also because the xml2palette.py tool is now deprecated and will be removed soon.