drop support for Python 2.7.x

Author: ThibHlln

changelog.rst

@@ -5,6 +5,10 @@ latest
 
 Yet to be versioned and released. Only available from *dev* branch until then.
 
+.. rubric:: General
+
+* drop support for Python 2.7.x
+
 .. rubric:: Big fixes
 
 * fix bug in output writing for `montecarlo` due to change in behaviour in `spotpy`

requirements.txt

@@ -1,3 +1,2 @@
 numpy>=1.16
 scipy
-future

setup.py

@@ -46,8 +46,6 @@ def requirements(filename):
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

smartpy/inout.py

@@ -23,8 +23,6 @@
 from datetime import datetime, timedelta
 import numpy as np
 from collections import OrderedDict
-import sys
-import io
 import argparse
 try:
     from netCDF4 import Dataset
@@ -36,27 +34,6 @@
 from .version import __version__
 
 
-def open_csv_rb(my_file):
-    if sys.version_info[0] < 3:
-        return io.open(my_file, 'rb')
-    else:
-        return io.open(my_file, 'r', encoding='utf8')
-
-
-def open_csv_wb(my_file):
-    if sys.version_info[0] < 3:
-        return io.open(my_file, 'wb')
-    else:
-        return io.open(my_file, 'w', newline='', encoding='utf8')
-
-
-def open_csv_ab(my_file):
-    if sys.version_info[0] < 3:
-        return io.open(my_file, 'ab')
-    else:
-        return io.open(my_file, 'a', newline='', encoding='utf8')
-
-
 def get_dict_rain_series_simu(file_location, file_format, start_simu, end_simu, time_delta_simu):
     dict_rain, start_data, end_data, time_delta_data = read_rain_file(file_location, file_format)
 
@@ -202,7 +179,7 @@ def read_flow_file(file_location, file_format):
 def read_simulation_settings_file(file_location):
     my_dict_args = dict()
     try:
-        with open_csv_rb(file_location) as my_file:
+        with open(file_location, 'r', encoding='utf8') as my_file:
             my_reader = DictReader(my_file)
             for row in my_reader:
                 my_dict_args[row['ARGUMENT']] = row['VALUE']
@@ -216,7 +193,7 @@ def read_simulation_settings_file(file_location):
 
 def read_csv_time_series_with_delta_check(csv_file, key_header, val_header):
     try:
-        with open_csv_rb(csv_file) as my_file:
+        with open(csv_file, 'r', encoding='utf8') as my_file:
             my_dict_data = dict()
             my_list_dt = list()
             my_reader = DictReader(my_file)
@@ -258,7 +235,7 @@ def read_netcdf_time_series_with_delta_check(netcdf_file, key_variable, val_vari
 
 def read_csv_time_series_with_missing_check(csv_file, key_header, val_header):
     try:
-        with open_csv_rb(csv_file) as my_file:
+        with open(csv_file, 'r', encoding='utf8') as my_file:
             my_dict_data = OrderedDict()
             my_reader = DictReader(my_file)
             try:
@@ -314,7 +291,7 @@ def write_flow_file_from_nds(series_report, discharge, the_file, out_file_format
 
 
 def write_flow_csv_file_from_nds(series_report, discharge, csv_file):
-    with open_csv_wb(csv_file) as my_file:
+    with open(csv_file, 'w', newline='', encoding='utf8') as my_file:
         my_writer = writer(my_file, delimiter=',')
         my_writer.writerow(['DateTime', 'flow'])
         for dt, val in zip(series_report, discharge):

smartpy/montecarlo/montecarlo.py

@@ -37,7 +37,7 @@
     Dataset = None
 
 from ..smart import SMART
-from ..inout import get_dict_simulation_settings, open_csv_rb, open_csv_wb
+from ..inout import get_dict_simulation_settings
 from ..objfunctions import groundwater_constraint
 from ..version import __version__
 
@@ -123,7 +123,7 @@ def _init_db(self):
                                 "please install it and retry, or choose another file format.")
 
         else:  # fall back on to default option (CSV file)
-            self.database = open_csv_wb(self.db_file)
+            self.database = open(self.db_file, 'w', newline='', encoding='utf8')
             simu_steps = [dt.strftime('%Y-%m-%d %H:%M:%S') for dt in self.model.flow] if self.save_sim else []
             # write header in database file
             self.database.write(','.join(self.obj_fn_names + self.param_names + simu_steps) + '\n')
@@ -254,7 +254,7 @@ def _get_sampled_sets_from_file(self, file_location, param_names, obj_fn_names,
                         params.append([row[param] for param in param_names])
             # collect parameter values and objective function values from CSV
             else:
-                with open_csv_rb(file_location) as my_file:
+                with open(file_location, 'r', encoding='utf8') as my_file:
                     my_reader = DictReader(my_file)
                     obj_fns, params = list(), list()
                     for row in my_reader:

smartpy/parameters.py

@@ -20,8 +20,6 @@
 
 from csv import DictReader
 
-from .inout import open_csv_rb
-
 
 class Parameters(object):
     def __init__(self):
@@ -58,7 +56,7 @@ def set_parameters_with_file(self, file_location):
         """
         my_dict_par = dict()
         try:
-            with open_csv_rb(file_location) as my_file:
+            with open(file_location, 'r', encoding='utf8') as my_file:
                 my_reader = DictReader(my_file)
                 for row in my_reader:
                     if row['PAR_NAME'] in self.names:

smartpy/timeframe.py

@@ -19,14 +19,10 @@
 # along with SMARTpy. If not, see <http://www.gnu.org/licenses/>.
 
 from builtins import range
-import sys
 from datetime import datetime, timedelta
 import argparse
 from collections import OrderedDict
-if sys.version_info[0] < 3:
-    from fractions import gcd
-else:
-    from math import gcd
+from math import gcd
 
 
 class TimeFrame(object):