From 403d60c070a35d1ac52c7d6c334139b0a95c5b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=2E=20Armando=20Sol=C3=A9?= Date: Fri, 23 Oct 2020 11:47:10 +0200 Subject: [PATCH 1/2] The previous test always worked --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6a7cbfbda..bcf4d7e58 100644 --- 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 \n int main()\n{return 0;}\n" if subprocess.call("echo '%s' | gcc -x c - " % c_prog, shell=True) == 0: c_prog = "#include \n int main()\n{return 0;}\n" From 006ba7d579cb5c9887b77e14743878e443a3e648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=2E=20Armando=20Sol=C3=A9?= Date: Fri, 23 Oct 2020 11:51:54 +0200 Subject: [PATCH 2/2] Prepare release. --- PyMca5/__init__.py | 2 +- changelog.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py index 8a8628e24..aa3f6085d 100644 --- 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 index 0e249b35a..8905f5127 100644 --- 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 -------------