Merge pull request #759 from vasole/vasole-patch1

Prepare release
vasole · Oct 23, 2020 · 8bfeb1f · 8bfeb1f
2 parents 1aa016a + 006ba7d
commit 8bfeb1f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py
@@ -27,7 +27,7 @@
 __contact__ = "sole@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "5.6.1"
+__version__ = "5.6.2"
 
 import os
 import sys

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+VERSION 5.6.2
+-------------
+
+- IO. h5py 3.0.0 compatibility
+
+- Double-check OpenGL availability on startup
+
+- Allow building of PyMca under linux without OpenGL
+
 VERSION 5.6.1
 -------------
 

diff --git a/setup.py b/setup.py
@@ -540,7 +540,7 @@ def build_xas_xas(ext_modules):
     comp = distutils.ccompiler.get_default_compiler()
     if comp == "unix":
         import subprocess
-        if subprocess.call("which gcc > /dev/null", shell=True) == 0:
+        if subprocess.call("gcc -v > /dev/null 2>&1", shell=True) == 0:
             c_prog = "#include <stdint.h>\n int main()\n{return 0;}\n"
             if subprocess.call("echo '%s' | gcc -x c - " % c_prog, shell=True) == 0:
                 c_prog = "#include <GL/gl.h>\n int main()\n{return 0;}\n"