Drop Python 3.5 support

.travis.yml

@@ -2,7 +2,6 @@ dist: xenial
 
 language: python
 python:
-  - 3.5
   - 3.6
   - 3.7
   - 3.8

README.md

@@ -18,7 +18,7 @@
 * [FAQ](#faq)
 
 ## Installation
-Supported Python version is >= **3.5**.
+Supported Python version is >= **3.6**.
 ```
 pip install m2cgen
 ```

setup.py

@@ -25,14 +25,13 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
     keywords="sklearn ml code-generation",
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     install_requires=[
         "numpy",
     ],

tests/interpreters/test_haskell.py

@@ -61,7 +61,7 @@ def test_dependable_condition():
 
     expr = ast.IfExpr(bool_test, ast.NumVal(1), ast.FeatureRef(0))
 
-    expected_code_1 = """
+    expected_code = """
 module Model where
 score :: [Double] -> Double
 score input =
@@ -80,31 +80,10 @@ def test_dependable_condition():
                 else
                     (input) !! (0)
 """
-    expected_code_2 = """
-module Model where
-score :: [Double] -> Double
-score input =
-    func1
-    where
-        func1 =
-            if (((func0) + (2)) >= ((1) / (2)))
-                then
-                    1
-                else
-                    (input) !! (0)
-        func0 =
-            if ((1) == (1))
-                then
-                    1
-                else
-                    2
-"""
 
     interpreter = HaskellInterpreter()
     actual_code = interpreter.interpret(expr)
-    # dicts in Python 3.5 have nondeterministic order of keys
-    utils.assert_code_equal_any_of(
-        actual_code, expected_code_1, expected_code_2)
+    utils.assert_code_equal(actual_code, expected_code)
 
 
 def test_nested_condition():
@@ -124,7 +103,7 @@ def test_nested_condition():
 
     expr = ast.IfExpr(bool_test, expr_nested, ast.NumVal(2))
 
-    expected_code_1 = """
+    expected_code = """
 module Model where
 score :: [Double] -> Double
 score input =
@@ -147,35 +126,10 @@ def test_nested_condition():
                 else
                     2
 """
-    expected_code_2 = """
-module Model where
-score :: [Double] -> Double
-score input =
-    func1
-    where
-        func1 =
-            if ((1) == ((func0) + (2)))
-                then
-                    if ((1) == ((func0) + (2)))
-                        then
-                            (input) !! (2)
-                        else
-                            2
-                else
-                    2
-        func0 =
-            if ((1) == (1))
-                then
-                    1
-                else
-                    2
-"""
 
     interpreter = HaskellInterpreter()
     actual_code = interpreter.interpret(expr)
-    # dicts in Python 3.5 have nondeterministic order of keys
-    utils.assert_code_equal_any_of(
-        actual_code, expected_code_1, expected_code_2)
+    utils.assert_code_equal(actual_code, expected_code)
 
 
 def test_raw_array():

tests/utils.py

@@ -178,10 +178,6 @@ def assert_code_equal(actual, expected):
     assert actual.strip() == expected.strip()
 
 
-def assert_code_equal_any_of(actual, *expected):
-    assert any(actual.strip() == expect.strip() for expect in expected)
-
-
 get_regression_model_trainer = functools.partial(
     ModelTrainer.get_instance, "boston")