Python 3 updates (#4)

* updated python-config

* Updated travis to use python-config for py2

* Update .travis.yml

* removed future imports

Author: ewu63

.travis.yml

@@ -28,7 +28,7 @@ before_install:
 install:
   # We thrown away the existing repo in Docker, and copy the new one in-place
   - docker exec -it app /bin/bash -c "rm -rf $DOCKER_WORKING_DIR && cp -r $DOCKER_MOUNT_DIR $DOCKER_WORKING_DIR"
-  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && cp config/defaults/config.LINUX_GFORTRAN.mk config/config.mk && make"
+  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && cp config/defaults/config.LINUX_GFORTRAN.mk config/config.mk && sed -i 's/python3-config/python-config/g' config/config.mk && make"
 
 script:
   # We need to source the mdolab bashrc before running anything

config/defaults/config.LINUX_GFORTRAN.mk

@@ -13,7 +13,7 @@ CC_FLAGS   = -O2 -fPIC
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
-PYTHON-CONFIG = python-config
+PYTHON-CONFIG = python3-config # use python-config for python 2
 F2PY = f2py
 
 # Define additional flags for linking

config/defaults/config.LINUX_INTEL.mk

@@ -13,7 +13,7 @@ CC_FLAGS   = -O2 -fPIC
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
-PYTHON-CONFIG = python-config
+PYTHON-CONFIG = python3-config # use python-config for python 2
 F2PY = f2py
 
 # Define additional flags for linking

config/defaults/config.LINUX_INTEL_SCINET.mk

@@ -13,7 +13,7 @@ CC_FLAGS   = -O2 -fPIC
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
-PYTHON-CONFIG = python-config
+PYTHON-CONFIG = python3-config # use python-config for python 2
 F2PY = f2py
 
 # Define additional flags for linking

config/defaults/config.OSX_GFORTRAN.mk

@@ -13,7 +13,7 @@ CC_FLAGS   = -O2 -fPIC
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
-PYTHON-CONFIG = python-config
+PYTHON-CONFIG = python3-config # use python-config for python 2
 F2PY = f2py
 
 # Define additional flags for linking

python/examples/test_curve.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # This is a test script to test the functionality of the 
 # pySpline curve class
 

python/examples/test_surf.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # This is a test script to test the functionality of the 
 # pySpline surface
 import numpy

python/examples/test_volume.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
  # This simple script test some of the volume functionality in pySpline
 import numpy
 from pyspline import pySpline

python/pySpline.py

@@ -5,8 +5,6 @@
 Contains classes for working with B-spline :class:`Curve`, :class:`Surface` and
 :class:`Volume`
 """
-from __future__ import print_function
-from __future__ import division
 
 # ===========================================================================
 # External Python modules

python/reg_tests/mdo_regression_helper.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # This file contains two functions to help regression testing. The
 # first is used to format float values with a specified absolute and
 # relative tolerance. This information is used by the second function

python/reg_tests/run_reg_tests.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================

python/reg_tests/test_curves.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================

python/reg_tests/test_surfaces.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================

python/reg_tests/test_volumes.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================

src/f2py/Makefile

@@ -21,7 +21,7 @@ all:
 	 @echo "#------------------------------------------------------#"
 
 # Generate Numpy inlude directory
-	$(eval NUMPY_INCLUDES = $(shell $(PYTHON) -c 'from __future__ import print_function; import numpy; print(numpy.get_include())'))
+	$(eval NUMPY_INCLUDES = $(shell $(PYTHON) -c 'import numpy; print(numpy.get_include())'))
 	 @echo "#------------------------------------------------------#"
 	 @echo Numpy Include Directory: $(NUMPY_INCLUDES)
 	 @echo "#------------------------------------------------------#"

src/f2py/get_f2py.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #------------- VERY IMPORTANT ------------ 
 
 # This script is necessary since f2py INSISTS on priting crap out when

src/f2py/importTest.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-from __future__ import print_function
 import sys
 
 print('Testing if module pyspline can be imported...')

tests/reg_tests/test_curves.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================

tests/reg_tests/test_surfaces.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================

tests/reg_tests/test_volumes.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # =============================================================================
 # Standard Python modules                                           
 # =============================================================================