-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Plot tweaks #82
Plot tweaks #82
Conversation
For some reason, it is only doing 1 test. Where did all the other tests go? |
Looking at the conflicts, I don't really understand why they are indicated as conflicts. They are different keywords that we added separately, but these are independent from each other. We want to keep both keywords. How can we fix this? |
The automated routine can't decide if the changes are in conflict or not. They are in the same place in the code and have different names. Hence it is kicking this back to the humans. The solution is to rebase and manually include both changes. |
Only one test in being run as there are merge conflicts, hence it cannot run any of the other tests. |
I merged the changes. This should solve the conflicts. |
I clearly broke the code by merging the changes. I will try to fix this. |
Been there. Did this last week. ;-) |
Removed duplicate keyword
Removed whitespace
Codecov Report
@@ Coverage Diff @@
## master #82 +/- ##
==========================================
+ Coverage 46.50% 47.00% +0.50%
==========================================
Files 18 18
Lines 2415 2436 +21
==========================================
+ Hits 1123 1145 +22
+ Misses 1292 1291 -1
Continue to review full report at Codecov.
|
Issues have been fixed. Tests are successful now. This PR is ready to be reviewed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
This PR contains several changes to the plotting of spectra and extinction curves:
Other changes:
Some changes will be in conflict with the latest merge from PR #66 , so we will have to fix the conflicts first.