Final changes for python 3 compatibility

postlogist · Feb 23, 2014 · 2738ccb · 2738ccb
1 parent 23f15c6
commit 2738ccb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,7 +3,6 @@ include INSTALL
 include LICENSE
 include MANIFEST.in
 include README
-include VERSION
 include HISTORY
 include setup.py
 include ez_setup.py

diff --git a/VERSION b/VERSION
diff --git a/setup.py b/setup.py
@@ -12,7 +12,10 @@
 
 License = open('LICENSE').read()
 
-Version = open('VERSION').read().strip()
+# read the version number safely from the constants.py file
+version_dict = {}
+exec(open('src/pulp/constants.py').read(), version_dict)
+VERSION = version_dict['VERSION']
 
 #hack because pyparsing made version 2 python 3 specific
 if sys.version_info[0] <= 2:
@@ -21,7 +24,7 @@
     pyparsing_ver = 'pyparsing>=2.0.0'
 
 setup(name="PuLP",
-      version=Version,
+      version=VERSION,
       description="""
 PuLP is an LP modeler written in python. PuLP can generate MPS or LP files
 and call GLPK, COIN CLP/CBC, CPLEX, and GUROBI to solve linear

diff --git a/src/pulp/__init__.py b/src/pulp/__init__.py
@@ -29,8 +29,7 @@
 
 Copyright 2007- Stuart Mitchell ([email protected])
 """
-
-VERSION = '1.5.5'
+from .constants import VERSION
 
 from .pulp import *
 from .amply import *

diff --git a/src/pulp/constants.py b/src/pulp/constants.py
@@ -28,7 +28,7 @@
 This file contains the constant definitions for PuLP
 Note that hopefully these will be changed into something more pythonic
 """
-
+VERSION = '1.5.5'
 EPS = 1e-7
 
 # variable categories