Skip to content

Commit 3498c18

Browse files
author
Dilawar Singh
committed
Bumped version to 3.1.2
1 parent fc14920 commit 3498c18

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

basecode/global.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ extern unsigned int totalTests;
4848
#define TEST_END totalTests++; \
4949
cout << std::right << setw(20) << "test of " << SIMPLE_CURRENT_FUNCTION << " finished.";
5050

51-
/*-----------------------------------------------------------------------------
52-
* Global functions in namespace moose
53-
*-----------------------------------------------------------------------------*/
5451
#define MISSING_BRACKET_AT_END -1
5552
#define EMPTY_PATH -2
5653
#define SPACES_AT_THE_BEGINING -3
@@ -59,6 +56,9 @@ extern unsigned int totalTests;
5956
#define BAD_CHARACTER_IN_PATH -6
6057

6158

59+
/*-----------------------------------------------------------------------------
60+
* Global functions in namespace moose
61+
*-----------------------------------------------------------------------------*/
6262
namespace moose
6363
{
6464

python/setup.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,19 @@
1212
# You should have received a copy of the GNU General Public License
1313
# along with MOOSE. If not, see <http://www.gnu.org/licenses/>.
1414

15-
16-
"""setup.py:
17-
18-
Script to install python targets.
19-
20-
"""
21-
2215
__author__ = "Dilawar Singh"
23-
__copyright__ = "Copyright 2013, Dilawar Singh and NCBS Bangalore"
16+
__copyright__ = "Copyright 2013-17, Dilawar Singh"
2417
__credits__ = ["NCBS Bangalore"]
25-
__license__ = "GNU GPL"
26-
__version__ = "1.0.0"
18+
__license__ = "GNU GPLv3"
2719
__maintainer__ = "Dilawar Singh"
2820
__email__ = "[email protected]"
29-
__status__ = "Development"
3021

3122
import os
3223
from distutils.core import setup
3324

3425
script_dir = os.path.dirname( os.path.abspath( __file__ ) )
3526

3627
version = '3.1.2'
37-
try:
38-
with open( os.path.join( script_dir, '..', 'VERSION'), 'r' ) as f:
39-
version = f.read( )
40-
except Exception as e:
41-
print( 'Failed to read VERSION %s' % e )
42-
print( 'Using default 3.1' )
4328

4429
try:
4530
import importlib.machinery
@@ -51,7 +36,7 @@
5136
name='moose',
5237
version=version,
5338
description='MOOSE python scripting module.',
54-
author='MOOSERes',
39+
author='See AUTHORS file',
5540
author_email='[email protected]',
5641
maintainer='Dilawar Singh',
5742
maintainer_email='[email protected]',

0 commit comments

Comments
 (0)