Changeset 9588
- Timestamp:
- Feb 2, 2015, 4:53:54 PM (9 years ago)
- Location:
- trunk/anuga_core
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_core/anuga/__init__.py
r9587 r9588 28 28 from .version import git_revision as __git_revision__ 29 29 from .version import version as __version__ 30 __svn_version__ = filter(str.isdigit, "$Revision$") 30 31 31 32 32 33 -
trunk/anuga_core/setup.cfg
r9582 r9588 1 1 2 2 [pytest] 3 addopts = --ignore= anuga/test_all.py3 addopts = --ignore=test_all.py 4 4 --ignore=build 5 5 --ignore=setup.py 6 --ignore=anuga/build 7 --ignore=anuga/parallel 6 --ignore=anuga 7 --ignore=demos 8 --ignore=tools 9 --ignore=validation_tests 10 --ignore=user_manual 8 11 --cov-report term --cov . -
trunk/anuga_core/setup.py
r9582 r9588 30 30 raise RuntimeError("Python version 2.6, 2.7. ") 31 31 32 if sys.version_info[0] >= 3: 33 import builtins 34 else: 35 import __builtin__ as builtins 32 # if sys.version_info[0] >= 3: 33 # import builtins 34 # else: 35 # import __builtin__ as builtins 36 import __builtin__ as builtins 36 37 37 38 … … 58 59 59 60 61 # Return the svn revision as a string 62 def svn_revision(): 63 64 return filter(str.isdigit, "$Revision: 9587 $") 65 66 67 68 60 69 # Return the git revision as a string 61 def git_ version():70 def git_revision(): 62 71 63 72 #return "Unknown" … … 100 109 # otherwise the import of anuga.version messes up the build under Python 3. 101 110 FULLVERSION = VERSION 111 SVN_REVISION = svn_revision() 112 102 113 if os.path.exists('.git'): 103 GIT_REVISION = git_ version()114 GIT_REVISION = git_revision() 104 115 elif os.path.exists('anuga/version.py'): 105 116 # must be a source distribution, use existing version file … … 114 125 115 126 if not ISRELEASED: 116 FULLVERSION += '.dev+' + GIT_REVISION[:7] 117 118 return FULLVERSION, GIT_REVISION 127 FULLVERSION += '.dev+' + SVN_REVISION 128 #FULLVERSION += '.dev+' + GIT_REVISION[:7] 129 130 131 return FULLVERSION, GIT_REVISION, SVN_REVISION 119 132 120 133 … … 126 139 full_version = '%(full_version)s' 127 140 git_revision = '%(git_revision)s' 141 svn_revision = '%(svn_revision)s' 128 142 release = %(isrelease)s 129 143 … … 131 145 version = full_version 132 146 """ 133 FULLVERSION, GIT_REVISION = get_version_info()147 FULLVERSION, GIT_REVISION, SVN_REVISION = get_version_info() 134 148 135 149 a = open(filename, 'w') … … 138 152 'full_version' : FULLVERSION, 139 153 'git_revision' : GIT_REVISION, 154 'svn_revision' : SVN_REVISION, 140 155 'isrelease': str(ISRELEASED)}) 141 156 finally:
Note: See TracChangeset
for help on using the changeset viewer.