git-sync ignores whitespace diffs. #105
Merged
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
cslocum
commented
Jul 12, 2021
| @@ -4,8 +4,8 @@ channels: | |||
| - http://ssb.stsci.edu/astroconda | |||
| - defaults | |||
| dependencies: | |||
| #- bqplot-image-gl==1.4.1 | |||
There was a problem hiding this comment.
@jaytmiller I'm not sure why these packages needed to be specified here, but they were necessary in the latest jwebbinar build.
There was a problem hiding this comment.
I think packages in base.yml are only going into the base Python environment.
Aside from env cloning, packages to be installed in all Python environments are either defined in common-env or common-scripts.
jaytmiller
reviewed
Jul 12, 2021
| @@ -4,8 +4,8 @@ channels: | |||
| - http://ssb.stsci.edu/astroconda | |||
| - defaults | |||
| dependencies: | |||
| #- bqplot-image-gl==1.4.1 | |||
There was a problem hiding this comment.
I think packages in base.yml are only going into the base Python environment.
Aside from env cloning, packages to be installed in all Python environments are either defined in common-env or common-scripts.
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.
We were having a problem where diffs were being detected (technically, properly), but the only differences were whitespace. This was resulting in
git-synccreating backups of the "changed" files - an unwanted behavior. Changes in this PR adjust some logic, and add a flag togit diffto ignore whitespace.Also fixed logic error that evaluates
$USE_CENTRAL_ECR