From 37e2f87e592cd86aa412efee6a5d63d12a9cda58 Mon Sep 17 00:00:00 2001 From: Jakub Gregus Date: Mon, 16 Dec 2024 18:27:35 +0200 Subject: [PATCH 1/6] added doc link to readme --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index 4c287be0..99770a78 100644 --- a/README +++ b/README @@ -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 From 4c76cc5512894bc1ecb438d2b36a921210bdd46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Gregu=C5=A1?= <78053388+Gekbako@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:22:59 +0200 Subject: [PATCH 2/6] Update README - no hashtag --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 99770a78..6931f9fe 100644 --- a/README +++ b/README @@ -68,7 +68,7 @@ https://github.com/fmihpc/analysator/wiki # Analysator documentation on the link: ################################################# -https://fmihpc.github.io/analysator/# +https://fmihpc.github.io/analysator/ # For citations, use the DOI or the ready-made button the the right in GitHub! ################################################# From 3660efc960637e92b789e83338305b7708b47562 Mon Sep 17 00:00:00 2001 From: Alho Markku J Date: Mon, 16 Dec 2024 20:02:08 +0200 Subject: [PATCH 3/6] Guard against double-registration of colormaps in Matplotlib. --- pyPlots/colormaps.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pyPlots/colormaps.py b/pyPlots/colormaps.py index dba7fdfe..8deec41b 100644 --- a/pyPlots/colormaps.py +++ b/pyPlots/colormaps.py @@ -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)) + From a0706bee8842b1f6f4d03e2bc1e526cb752ae8ba Mon Sep 17 00:00:00 2001 From: Alho Markku J Date: Mon, 16 Dec 2024 20:18:09 +0200 Subject: [PATCH 4/6] Force ubuntu-22.04 for now since latest/ubuntu-24.04 fails on Pytohn 3.7 --- .github/workflows/test_python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index 6db2d816..812958e8 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml @@ -14,7 +14,7 @@ jobs: latest: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false From 37bd04c6b951eca90f1826d54519ff79430a5c62 Mon Sep 17 00:00:00 2001 From: Alho Markku J Date: Mon, 16 Dec 2024 20:21:18 +0200 Subject: [PATCH 5/6] Enforce it where it matters. --- .github/workflows/test_python.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index 812958e8..887f4179 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml @@ -14,7 +14,7 @@ jobs: latest: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false @@ -33,9 +33,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: From 913ae64425491e7b0eb50265f6feb1156d7bbb2b Mon Sep 17 00:00:00 2001 From: Alho Markku J Date: Mon, 16 Dec 2024 20:28:17 +0200 Subject: [PATCH 6/6] Add weekly import test to catch fresh dependency issues (or GitHub Actions changes) --- .github/workflows/test_python.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index 887f4179..8c45dd32 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml @@ -8,6 +8,8 @@ on: branches: [ master ] pull_request: branches: [ master ] + schedule: + - cron: '0 8 * * MON' workflow_dispatch: jobs: