Rename CET maps to algorithmic names #64
Merged
Conversation
This file contains hidden or 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
jbednar
approved these changes
Feb 24, 2021
There was a problem hiding this comment.
Looks good, thanks! I guess the plan is to later remove the v1/v2 distinction altogether (e.g. aliases_v2), to make it simple to include v3?
I added a # cmap_def comment to each colormap definition in init.py to easily find them with a regex.
That's ok if it really helps some other tooling, but it doesn't seem necessary to me, since ^[a-zA-Z].* = [[] already matches the same set of lines.
CET_to_py.py does now use pathlib so it needs to be run with Python 3. colorcet itself still works fine in Python 2.7.
Sure. No problem requiring py3 for managing updates.
rename_CET_maps.py
That should go into assets for future reference.
jbednar
approved these changes
Feb 26, 2021
Yes. |
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.
As I mentioned here, this PR renames the
CET-*.pyCSVs to their algorithmic names (pulled frommappinginCET_to_py.py). They are merged intoassets/CETperceptual_csv_0_1with redundant maps deleted. See the attachedrename_CET_maps.pyscript to see how this was accomplished.As an aside, I did check that duplicated maps were the same before executing the merge (the automated diffs are not present in the attached script). Other than some
floatcalculation discrepancies (0vs4.25235e-17or whatever), they were the same.I also modified
CET_to_py.pya bit to find the existing order of maps incolorcet/__init__.pyand keep those maps as-is (as requested here) when regenerating it to reduce questions about the diff. I added a# cmap_defcomment to each colormap definition in__init__.pyto easily find them with a regex.CET_to_py.pydoes now usepathlibso it needs to be run with Python 3. I guess for that matter I could have usedf-strings, but stuck with the existingstr.format()use.colorcetitself still works fine in Python 2.7.