Skip to content

Commit

Permalink
gcc/g++ version bugfix (2.2.1 release) (#365)
Browse files Browse the repository at this point in the history
* improve gcc/g++ version detection
* closes #364
  • Loading branch information
kecnry authored Jan 14, 2020
1 parent 48737be commit a449a89
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion phoebe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"""

__version__ = '2.2.0'
__version__ = '2.2.1'

import os as _os
import sys as _sys
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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 = '[email protected]',
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/*'],
Expand Down

0 comments on commit a449a89

Please sign in to comment.