Skip to content

Commit

Permalink
Merge branch 'master' into vtk_interface
Browse files Browse the repository at this point in the history
  • Loading branch information
alhom committed Dec 16, 2024
2 parents f8512ac + 913ae64 commit 9df2f01
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/test_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
schedule:
- cron: '0 8 * * MON'
workflow_dispatch:

jobs:
Expand All @@ -33,9 +35,9 @@ jobs:
- name: Trial imports
run: python -c 'import pytools as pt'

import-matrix:
ubuntu_22_04_versions:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 4 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ export PTOUTPUTDIR=/proj/USERNAME/Plots/
#################################################
https://github.com/fmihpc/analysator/wiki

# Analysator documentation on the link:
#################################################
https://fmihpc.github.io/analysator/

# For citations, use the DOI or the ready-made button the the right in GitHub!
#################################################
https://doi.org/10.5281/zenodo.4462514
Expand Down
16 changes: 10 additions & 6 deletions pyPlots/colormaps.py
Original file line number Diff line number Diff line change
Expand Up @@ -1172,9 +1172,13 @@
_cm_name = _cm_name[:-4]
_cm_data = np.loadtxt(_f)
_cm = LinearSegmentedColormap.from_list(_cm_name, _cm_data)
if Version(mpl_version) > Version("3.5.0"):
mcm.register(_cm)
mcm.register(_cm.reversed())
else:
plt.register_cmap(cmap=_cm)
plt.register_cmap(cmap=_cm.reversed())
try:
if Version(mpl_version) > Version("3.5.0"):
mcm.register(_cm)
mcm.register(_cm.reversed())
else:
plt.register_cmap(cmap=_cm)
plt.register_cmap(cmap=_cm.reversed())
except Exception as e:
logging.warning("Problem registering colormap " + _cm_name + ". Produced exception was:\n"+str(e))

0 comments on commit 9df2f01

Please sign in to comment.