Complete 2-3 conversion. Some bugs.

docs/source/conf.py

@@ -55,9 +55,9 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'robust'
-copyright = u'2020, Ali Saab and Berk Ozturk'
-author = u'Ali Saab and Berk Ozturk'
+project = 'robust'
+copyright = '2020, Ali Saab and Berk Ozturk'
+author = 'Ali Saab and Berk Ozturk'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -231,8 +231,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'robust.tex', u'robust Documentation',
-   u'Ali Saab and Berk Ozturk', 'manual'),
+  (master_doc, 'robust.tex', 'robust Documentation',
+   'Ali Saab and Berk Ozturk', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -261,7 +261,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'robust', u'robust Documentation',
+    (master_doc, 'robust', 'robust Documentation',
      [author], 1)
 ]
 
@@ -275,7 +275,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'robust', u'robust Documentation',
+  (master_doc, 'robust', 'robust Documentation',
    author, 'robust', 'One line description of project.',
    'Miscellaneous'),
 ]

robust/data/construct_linearization_data.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 from builtins import range
 import numpy as np
 

robust/equivalent_models.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 from gpkit import Model
 from gpkit.nomials import MonomialEquality, PosynomialInequality
 from gpkit.exceptions import InvalidGPConstraint

robust/equivalent_posynomials.py

@@ -1,5 +1,5 @@
-from __future__ import absolute_import
-from __future__ import division
+
+
 from builtins import range
 from builtins import object
 import numpy as np
@@ -89,7 +89,7 @@ def __init__(self, p, m, simple_model, dependent_uncertainties):
                 # Should streamline/speed up in the future.
                 new_no_data_posynomial = 0
                 hmap = NomialMap({HashVector(uncertain_vars_exps[i]): 1.0})
-                unitarr = [k.units**v for k, v in uncertain_vars_exps[i].items() if k.units]
+                unitarr = [k.units**v for k, v in list(uncertain_vars_exps[i].items()) if k.units]
                 try:
                     hmap.units = np.prod(unitarr)
                 except:

robust/feasibility_plots/FeasibilityDemo.py

@@ -1,5 +1,5 @@
-from __future__ import print_function
-from __future__ import absolute_import
+
+
 from gpkit import Variable, Model
 import numpy as np
 

robust/feasibility_plots/plot_feasibilities.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 from builtins import map
 from builtins import range
 import numpy as np

robust/linearize_twoterm_posynomials.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 from builtins import range
 from builtins import object
 import numpy as np

robust/margin.py

@@ -10,7 +10,7 @@ class MarginSetting(object):
     def __init__(self, **options):
         self._options = {'gamma': 1}
 
-        for key, value in options.items():
+        for key, value in list(options.items()):
             self._options[key] = value
 
     def get(self, option_name):
@@ -41,7 +41,7 @@ def setup(self, model, **options):
         # Determining margins
         self.substitutions = {k: v + self.setting.get("gamma") *
                                      np.sign(mag(self.nominal_solve['sensitivities']['constants'][k.key]))*k.key.pr * v / 100.0
-                                     for k, v in model.substitutions.items()
+                                     for k, v in list(model.substitutions.items())
                                      if k in model.varkeys and RobustGPTools.is_directly_uncertain(k)}
         self.cost = model.cost
         return Model(self.cost, model, self.substitutions)

robust/parallel_wrappers.py

@@ -1,7 +1,7 @@
 """
 This module contains functions and wrappers for running code in parallel.
 """
-from __future__ import print_function
+
 from builtins import range
 from multiprocessing import Pool, cpu_count
 import math

robust/robust.py

@@ -1,6 +1,6 @@
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
+
+
+
 from builtins import range
 from builtins import object
 from gpkit import Model, Variable, SignomialsEnabled
@@ -41,7 +41,7 @@ def __init__(self, **options):
             'iterationLimit': 10,
             'lognormal': True
         }
-        for key, value in options.items():
+        for key, value in list(options.items()):
             self._options[key] = value
 
         if self._options['twoTerm']:
@@ -157,7 +157,7 @@ def __init__(self, model, type_of_uncertainty_set, **options):
             warnings.warn('Equality constraints will not be robustified.')
 
     def setup(self, verbosity=0, **options):
-        for option, key in options.items():
+        for option, key in list(options.items()):
             self.setting.set(option, key)
 
         start_time = time()

robust/robust_gp_tools.py

@@ -1,5 +1,5 @@
-from __future__ import print_function
-from __future__ import division
+
+
 from builtins import range
 from builtins import object
 from gpkit import Model, Variable, Monomial
@@ -89,7 +89,7 @@ def monomials_from_data(exps, cs):
             raise Exception('Dict size mismatch in monomial creation.')
         monmaps = [NomialMap({exps[i]: cs[i]}) for i in range(len(exps))]
         for monmap in monmaps:
-            monmap.units = [k.units**v for k, v in list(monmap.keys())[0].items() if k.units]
+            monmap.units = [k.units**v for k, v in list(list(monmap.keys())[0].items()) if k.units]
         mons = [Monomial(monmap) for monmap in monmaps]
         return mons
 

robust/robustify_large_posynomial.py

@@ -1,5 +1,5 @@
-from __future__ import absolute_import
-from __future__ import division
+
+
 from builtins import map
 from builtins import zip
 from builtins import range
@@ -189,7 +189,7 @@ def no_coefficient_monomials(self):
         with no coefficients
         :return: The list of monomials
         """
-        monmaps = [NomialMap({exp: 1.}) for exp, c in self.p.hmap.items()]
+        monmaps = [NomialMap({exp: 1.}) for exp, c in list(self.p.hmap.items())]
         for monmap in monmaps:
             monmap.units = self.p.hmap.units
         mons = [Monomial(monmap) for monmap in monmaps]

robust/simulations/read_simulation_data.py

@@ -156,8 +156,8 @@ def generate_variable_gamma_plots(variable_gamma_file_path_name):
 
     gammas = list(dictionary_gamma.keys())
     gammas.sort()
-    methods = list(dictionary_gamma.values())[0].keys()
-    uncertainty_sets = list(dictionary_gamma.values())[0].values()[0].keys()
+    methods = list(list(dictionary_gamma.values())[0].keys())
+    uncertainty_sets = list(list(dictionary_gamma.values())[0].values())[0].keys()
     min_obj = min([dictionary_gamma[gamma][method][uncertainty_set]['Average performance']
                        for gamma in gammas
                        for method in methods
@@ -195,8 +195,8 @@ def generate_variable_pwl_plots(variable_pwl_file_path_name):
     dictionary_pwl, properties_pwl = read_simulation_data(variable_pwl_file_path_name)
     numbers_of_linear_sections = list(dictionary_pwl.keys())
     numbers_of_linear_sections.sort()
-    methods = list(dictionary_pwl.values())[0].keys()
-    uncertainty_sets = list(dictionary_pwl.values())[0].values()[0].keys()
+    methods = list(list(dictionary_pwl.values())[0].keys())
+    uncertainty_sets = list(list(dictionary_pwl.values())[0].values())[0].keys()
     for uncertainty_set in uncertainty_sets:
         method_average_objective_dictionary = \
             {method: [dictionary_pwl[number_of_linear_sections][method][uncertainty_set]['Average performance']

robust/simulations/simulate.py

@@ -1,5 +1,5 @@
-from __future__ import print_function
-from __future__ import division
+
+
 from builtins import range
 import numpy as np
 from gpkit.small_scripts import mag

robust/synthetic_model/models.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 from builtins import range
 import numpy as np
 from gpkit import Variable, Model

robust/synthetic_model/synthetic_model.py

@@ -1,6 +1,6 @@
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
+
+
+
 from robust.synthetic_model import models
 
 from robust.robust import RobustModel

robust/testing/t_linearization.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 from builtins import zip
 from builtins import range
 import numpy as np

robust/testing/t_two_term_approximation.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 from builtins import range
 import numpy as np
 from gpkit import Variable, Model

robust/twoterm_approximation.py

@@ -1,5 +1,5 @@
-from __future__ import absolute_import
-from __future__ import division
+
+
 from builtins import range
 from builtins import object
 import numpy as np

setup.py

@@ -1,5 +1,5 @@
 """Python setup script for robust"""
-from __future__ import print_function
+
 from distutils.core import setup
 
 description = """
@@ -36,5 +36,6 @@
                 "robust.solar_model", "robust.synthetic_model", "robust.testing",
                 "robust.simulations"],
       package_data={"robust.data":['*.txt'], "robust.solar_model":['*.txt']},
+      python_requires=">=3.5.2",
       install_requires=['gpkit', 'gplibrary', 'numpy', 'matplotlib', 'scipy'])
 s