Fixes to get chandra_models and paths working on Windows #34
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
taldcroft
changed the title
javierggt
approved these changes
Jun 5, 2023
| @@ -193,7 +215,8 @@ def get_data( | |||
| data, repo_file_path = read_func(repo_file_path, **read_func_kwargs) | |||
|
|
|||
| # Compute the MD5 sum of repo_file_path. | |||
| md5 = hashlib.md5(repo_file_path.read_bytes()).hexdigest() | |||
| file_bytes = repo_file_path.read_bytes().replace(b"\r", b"") | |||
There was a problem hiding this comment.
why .replace(b"\r", b"")?
There was a problem hiding this comment.
The file in the windows repo has been "fixed" by git to have windows line endings, so the MD5 sum doesn't match Linux.
|
Note: I also ran the tests on Linux and OSX |
This was referenced Jun 5, 2023
Merged
This was referenced Jul 11, 2023
Merged
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.
Description
With these changes the package is passing unit tests on Windows, assuming that the
chandra_modelsrepo that it sees is not "dirty". That currently happens if the repo is cross mounted in Parallels from a Mac. For my testing I defined theCHANDRA_MODELS_REPO_DIRenvironment to point to a clean version of the repo. This in turn led to another fix in the tests.Interface impacts
Testing
Unit tests
Independent check of unit tests by Javier
Functional tests
No functional testing.