From a449a89911fdee0afcff7781d6ef09f4b11bea51 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 14 Jan 2020 12:00:25 -0500 Subject: [PATCH] gcc/g++ version bugfix (2.2.1 release) (#365) * improve gcc/g++ version detection * closes #364 --- README.md | 4 ++++ phoebe/__init__.py | 2 +- setup.py | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dd22f9cd6..bc3be73c7 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,10 @@ To understand how to use PHOEBE, please consult the [tutorials, scripts and manu CHANGELOG ---------- +### 2.2.1 - g++/gcc version check hotfix + +* Improves the detection of g++/gcc version to compare against requirements during setup. + ### 2.2.0 - extinction feature release * Add support for interstellar extinction/reddening. diff --git a/phoebe/__init__.py b/phoebe/__init__.py index 03b6eea8d..7ba583192 100644 --- a/phoebe/__init__.py +++ b/phoebe/__init__.py @@ -14,7 +14,7 @@ """ -__version__ = '2.2.0' +__version__ = '2.2.1' import os as _os import sys as _sys diff --git a/setup.py b/setup.py index 0b6097002..60afae19d 100644 --- a/setup.py +++ b/setup.py @@ -41,9 +41,9 @@ def removefile(f): def find_version_gcc(s): if len(s): - return s.split()[-2] - else: - return '' + for i in s.split(): + if re.search("^\d+\.\d+\.*\d*$",i): return i + return '' def __find_version_clang(s): @@ -322,12 +322,12 @@ def _env_variable_bool(key, default): return False setup (name = 'phoebe', - version = '2.2.0', - description = 'PHOEBE 2.2.0', + version = '2.2.1', + description = 'PHOEBE 2.2.1', author = 'PHOEBE development team', author_email = 'phoebe-devel@lists.sourceforge.net', url = 'http://github.com/phoebe-project/phoebe2', - download_url = 'https://github.com/phoebe-project/phoebe2/tarball/2.2.0', + download_url = 'https://github.com/phoebe-project/phoebe2/tarball/2.2.1', packages = ['phoebe', 'phoebe.parameters', 'phoebe.frontend', 'phoebe.constraints', 'phoebe.dynamics', 'phoebe.distortions', 'phoebe.algorithms', 'phoebe.atmospheres', 'phoebe.backend', 'phoebe.utils', 'phoebe.dependencies', 'phoebe.dependencies.autofig', 'phoebe.dependencies.nparray', 'phoebe.dependencies.unitsiau2015'], install_requires=['numpy>=1.10','scipy>=0.17','astropy>=1.0,<3.0' if sys.version_info[0] < 3 else 'astropy>=1.0', 'pytest'], package_data={'phoebe.atmospheres':['tables/wd/*', 'tables/passbands/*'],