Version 1.3.2

Dockerfile-stable

@@ -178,6 +178,7 @@ COPY ./external/sqlite ./external/sqlite
 COPY ./include/ ./include/
 COPY ./vendor/patch/ ./vendor/patch/
 COPY ./vendor/fonts/ ./vendor/fonts/
+COPY ./vendor/wheels/ ./vendor/wheels/
 
 ENV PATH "/sci/bin:$PATH"
 ENV CPATH="/sci/include/"
@@ -525,8 +526,6 @@ RUN set -eux; \
 
 ENV LD_LIBRARY_PATH="/sci/lib:/sci/lib64:$LD_LIBRARY_PATH"
 
-COPY ./vendor/wheels/ ./vendor/wheels/
-
 # Pythran:
 
 RUN set -eux; \

README.md

@@ -111,10 +111,14 @@ and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-### [Unreleased]
+### [1.3.2] - 2022-12-18
 #### Added
 - Clarify license in `setup.py`
 
+#### Changed
+- Fixed an execution order error in `Docker-stable`.
+- Small fix in `A10-Gamma-Sketch.ipynb`.
+
 ### [1.3.1] - 2022-12-18
 #### Added
 - Add missing function `boost::assertion_failed_msg` that caused an undefined

docs/conf.py

@@ -9,7 +9,7 @@
 project = 'REHEATFUNQ'
 copyright = '2022-2023, Deutsches GeoForschungsZentrum Potsdam & Malte J. Ziebarth'
 author = 'Malte J. Ziebarth'
-release = '1.3.1'
+release = '1.3.2'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/usage/installation.rst

@@ -120,7 +120,7 @@ is built. The combined source code archive of this software is large (the
 :code:`Dockerfile-stable` starts by bootstrapping the GNU Compiler Collection
 and successively compiles the Python ecosystem and numeric software) and it is
 split off this git repository. Therefore, you first need to download the
-:code:`vendor-1.3.1.tar.xz` archive from
+:code:`vendor-1.3.2.tar.xz` archive from
 `GFZ Data Services <https://doi.org/10.5880/GFZ.2.6.2022.005>`__. Following
 the instructions presented therein, extract the :code:`compile` and
 :code:`wheels` subfolders into the :code:`vendor` directory of this repository.
@@ -129,11 +129,11 @@ Then, you can build and run the Docker image as above:
 
 .. code :: bash
 
-   sudo docker build -f Dockerfile-stable -t 'reheatfunq-1.3.1' .
-   sudo docker run -p XXXX:8888 reheatfunq-1.3.1
+   sudo docker build -f Dockerfile-stable -t 'reheatfunq-1.3.2' .
+   sudo docker run -p XXXX:8888 reheatfunq-1.3.2
 
 Nearly all of the dependencies of this container are contained in
-:code:`vendor-1.3.1.tar.xz` so that this image should build reproducibly in the
+:code:`vendor-1.3.2.tar.xz` so that this image should build reproducibly in the
 long-term. Nevertheless, the Debian snapshot used as a base image might be
 unavailable at some point in the future of this writing. In this case, it
 should be possible to swap the base image to another linux without great impact.

jupyter/REHEATFUNQ/A10-Gamma-Sketch.ipynb

@@ -65,14 +65,15 @@
     "ax = fig.add_axes((0.075, 0.17, 0.42, 0.81))\n",
     "ax.set_ylim(0.0, 1.8)\n",
     "ax.set_xlim(0.0, 180.0)\n",
+    "beta_unit = '10^{-2}\\\\,\\\\mathrm{mW}^{-1}\\\\,\\\\mathrm{m}^{-2}'\n",
     "for i,(a,b) in enumerate(zip(ALPHA, BETA)):\n",
     "    ax.plot(qplot, 100*gamma_pdf(qplot, a, 1/b), color=[color3, color0, color1, color2][i],\n",
     "            linewidth=[1.1, 1.0, 1.0, 1.2][i],\n",
-    "            label=('$\\\\alpha=%1d$, $\\\\beta=%.1f\\\\times10^{-2}$' % (a,100*b)) if i > 0 else\n",
-    "                  ('$\\\\alpha=%1.1f$, $\\\\beta=%.1f\\\\times10^{-2}$' % (a,100*b)),\n",
+    "            label=('$\\\\alpha=%1d$, $\\\\beta=%.1f$' % (a,100*b)) if i > 0 else\n",
+    "                  ('$\\\\alpha=%1.1f$, $\\\\beta=%.1f$' % (a,100*b)),\n",
     "            linestyle='--' if i == 0 else '-')\n",
     "\n",
-    "ax.legend()\n",
+    "ax.legend(title='$[\\\\beta]='+beta_unit+'$')\n",
     "ax.set_xlabel('Heat flow $q$ ($\\mathrm{mW\\,m}^{-2}$)')\n",
     "ax.set_ylabel('PDF ($\\mathrm{m}^2\\mathrm{mW}^{-1}$)')\n",
     "ax.text(10, 1.7, '(a)')\n",
@@ -92,7 +93,7 @@
     "ax.plot(qplot, 0.5*qplot, linestyle='--', color='k', linewidth=0.5, label='$\\\\frac{1}{2}q$')\n",
     "    \n",
     "    \n",
-    "ax.legend()\n",
+    "ax.legend(title='$[\\\\beta]='+beta_unit+'$')\n",
     "ax.set_xlabel('Heat flow $q$ ($\\mathrm{mW\\,m}^{-2}$)')\n",
     "ax.set_ylabel('CDF')\n",
     "ax.text(1.3e-5, 0.1, '(b)')\n",
@@ -147,7 +148,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.10.9"
   }
  },
  "nbformat": 4,

meson.build

@@ -1,4 +1,4 @@
-project('REHEATFUNQ','cpp','cython', version : '1.3.1',
+project('REHEATFUNQ','cpp','cython', version : '1.3.2',
         default_options : ['optimization=3'])
 add_project_arguments(['-std=c++20'], language : 'cpp')
 

setup.py

@@ -30,7 +30,7 @@
 
 
 setup(name='REHEATFUNQ',
-      version='1.3.1',
+      version='1.3.2',
       author='Malte J. Ziebarth',
       description='',
       packages = ['reheatfunq','reheatfunq.regional','reheatfunq.anomaly',