Commit 92c1b72c authored by Keith Bennett's avatar Keith Bennett

Merge branch 'hotfix/2.5.18'

parents 06b8c1e5 3fd2b7ff
......@@ -30,7 +30,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.17"
#define VERSION "2.4.18"
#define DBG_FLUSH() do { \
if (h && h->dbg_buf) { \
......
import os
import re
import glob
import numpy as np
import matplotlib.pyplot as plt
from matplotlib.transforms import Bbox
from matplotlib.offsetbox import HPacker, VPacker, TextArea, AnchoredOffsetbox
try:
import numpy as np
import matplotlib.pyplot as plt
from matplotlib.transforms import Bbox
from matplotlib.offsetbox import HPacker, VPacker, TextArea, \
AnchoredOffsetbox
except:
pass
try:
from mpl_toolkits.axes_grid1 import make_axes_locatable
except:
# Workaround for broken macOS installation
import sys
import matplotlib
sys.path.append(os.path.join(matplotlib.__path__[0], '..', 'mpl_toolkits'))
from axes_grid1 import make_axes_locatable
try:
# Workaround for broken macOS installation
import sys
import matplotlib
sys.path.append(os.path.join(matplotlib.__path__[0], \
'..', 'mpl_toolkits'))
from axes_grid1 import make_axes_locatable
except:
pass
try:
import builtins
except:
......
......@@ -1584,7 +1584,7 @@ MOD_INIT(sdf)
if (!m)
return MOD_ERROR_VAL;
PyModule_AddStringConstant(m, "__version__", "2.4.17");
PyModule_AddStringConstant(m, "__version__", "2.4.18");
PyModule_AddStringConstant(m, "__commit_id__", SDF_COMMIT_ID);
PyModule_AddStringConstant(m, "__commit_date__", SDF_COMMIT_DATE);
s = sdf_get_library_commit_id();
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.17"
#define VERSION "2.4.18"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define ABS(a) (((a) < 0.0) ? -(a) : (a))
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.17"
#define VERSION "2.4.18"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment