Merge pull request #11 from SimonRouet/python3_upstream

Migration to Python 3

Author: rbarillot

example/MORPHOFLOR/multi_simulations.py

@@ -1,4 +1,4 @@
-import run_lgrass
+from example.MORPHOFLOR import run_lgrass
 import multiprocessing as mp
 import os
 import pandas as pd

lgrass/__init__.py

@@ -12,4 +12,4 @@
 """
 
 
-__version__  = '2.1'
+__version__  = '3.0'

lgrass/emergence_function.py

@@ -1,5 +1,5 @@
 # This file contains all fonctions associated with flowering
-import parameters
+from lgrass import parameters
 
 
 class FloweringFunctions:

lgrass/flowering_functions.py

@@ -18,6 +18,7 @@ def import_meteo_data(meteo_path, sowing_date, site):
         meteo_data = daylength_series(meteo_data)
         return meteo_data
 
+
 def thermal_time_calculation(meteo_data, sowing_date):
     """
     :param meteo_data: dataframe with 2 columns:   date: format 'YYYY_mm_dd'

lgrass/lgrass.lpy

@@ -33,15 +33,9 @@
 
 import lgrass
 
-if sys.version_info < (2, 7):
-    print('ERROR: lgrass requires at least Python 2.7 to run.')
-    sys.exit(1)
-
-if sys.version_info >= (3, 0):
-    print('WARNING: lgrass has not been tested with Python 3.')
-
 pkg_resources.require('numpy>=1.11.0', 'pandas>=0.18.0',  'OpenAlea.Lpy', 'OpenAlea.PlantGL', 'OpenAlea.Mtg')
 
+
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 

lgrass/meteo_ephem.py

@@ -94,9 +94,9 @@ def test_run(overwrite_desired_data=False):
     compare_actual_to_desired(OUTPUTS_DIRPATH, output_organ_lengths, DESIRED_OUTPUT_ORGAN_LENGTHS_FILENAME, output_organ_lengths_file_path, overwrite_desired_data)
 
     if overwrite_desired_data:
-        print ("New desired files written")
+        print("New desired files written")
     else:
-        print ("Test passed successfully")
+        print("Test passed successfully")
 
 if __name__ == '__main__':
     test_run(overwrite_desired_data=False)