From b5a7c2e2a2d7a1a5250ad20f8c43ac18910b7382 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Mon, 14 Nov 2016 17:03:08 +0530
Subject: [PATCH] Squashed 'moose-core/' changes from 14cf2df..9eeca0c
9eeca0c Fixed a typo in setup.py file. Due to which installation was failing without any warning.
git-subtree-dir: moose-core
git-subtree-split: 9eeca0ca8135fbf3c8fe7dd65ce408681b1e4605
---
VERSION | 2 +-
python/setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index 3b75fab3..264e8628 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0-120-g343cb02
\ No newline at end of file
+3.1.0-121-g14cf2df
\ No newline at end of file
diff --git a/python/setup.py b/python/setup.py
index 0e984ec4..58250433 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -31,7 +31,7 @@ __status__ = "Development"
import os
from distutils.core import setup
-script_dir = os.path.dirname( os.path.abspath( __FILE__ ) )
+script_dir = os.path.dirname( os.path.abspath( __file__ ) )
with open( os.path.join( script_dir, '../../VERSION'), 'r' ) as f:
version = f.read( )
--
GitLab