-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gcc/g++ version bugfix (2.2.1 release) (#365)
* improve gcc/g++ version detection * closes #364
- Loading branch information
Showing
3 changed files
with
11 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
""" | ||
|
||
__version__ = '2.2.0' | ||
__version__ = '2.2.1' | ||
|
||
import os as _os | ||
import sys as _sys | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 = '[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/*'], | ||
|