Move ci functions to this repo

ci/testkomodo.sh

@@ -1,3 +1,25 @@
+function ci_install_cmake {
+    pip install cmake ninja
+
+    local root=${KOMODO_ROOT}/${CI_KOMODO_RELEASE}/root
+
+    export CMAKE_GENERATOR=Ninja
+    export CMAKE_PREFIX_PATH=$root
+
+    # Colour!
+    export CFLAGS="${CFLAGS:-} -fdiagnostics-color=always"
+    export CXXFLAGS="${CXXFLAGS:-} -fdiagnostics-color=always"
+    export LDFLAGS="${LDFLAGS:-} -fdiagnostics-color=always"
+
+    export LD_LIBRARY_PATH=$root/lib:$root/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+}
+function ci_install_conan {
+    pip install "conan<2"
+
+    # Conan v1 bundles its own certs due to legacy reasons, so we point it
+    # to the system's certs instead.
+    export CONAN_CACERT_PATH=/etc/pki/tls/cert.pem
+}
 build_and_run_ctest () {
     pushd $CI_TEST_ROOT
     cmake $CI_SOURCE_ROOT                                  \

python/docs/examples/cmp_nnc.py

@@ -20,7 +20,7 @@
         nnc_list.append((g1, g2, t))
 
     nnc_list = sorted(nnc_list, key=itemgetter(0))
-    for (g1, g2, T) in nnc_list:
+    for g1, g2, T in nnc_list:
         # grid_ijk assumes 0-based indexing, g1/g2 are 1-based (FORTRAN)
         # Convert them to zero based ones.
         g1 = g1 - 1

python/ecl/ecl_type.py

@@ -25,7 +25,6 @@ class EclTypeEnum(BaseCEnum):
 
 
 class EclDataType(BaseCClass):
-
     TYPE_NAME = "ecl_data_type"
 
     _alloc = EclPrototype(

python/ecl/eclfile/fortio.py

@@ -148,7 +148,6 @@ def seek(self, position, whence=0):
 
     @classmethod
     def is_fortran_file(cls, filename, endian_flip=True):
-
         """@rtype: bool
         @type filename: str
 

python/ecl/gravimetry/ecl_grav_calc.py

@@ -69,7 +69,7 @@ def deltag(xyz, grid, init_file, restart_file1, restart_file2):
     porv2 = restart_file2.iget_named_kw("RPORV", 0)
 
     deltag = 0
-    for (sat1, sat2) in phase_list:
+    for sat1, sat2 in phase_list:
         rho_name = "%s_DEN" % sat1.name[1:]
         rho1 = restart_file1.iget_named_kw(rho_name, 0)
         rho2 = restart_file2.iget_named_kw(rho_name, 0)

python/ecl/grid/ecl_grid.py

@@ -232,7 +232,6 @@ def load_from_file(cls, filename):
 
     @classmethod
     def create(cls, specgrid, zcorn, coord, actnum, mapaxes=None):
-
         """
         Create a new grid instance from existing keywords.
 
@@ -277,7 +276,7 @@ def create_rectangular(cls, dims, dV, actnum=None):
         else:
             if not isinstance(actnum, IntVector):
                 tmp = IntVector(initial_size=len(actnum))
-                for (index, value) in enumerate(actnum):
+                for index, value in enumerate(actnum):
                     tmp[index] = value
                 actnum = tmp
 
@@ -1016,7 +1015,6 @@ def get_cell_dims(self, active_index=None, global_index=None, ijk=None):
         return (dx, dy, dz)
 
     def get_num_lgr(self):
-
         """
         How many LGRs are attached to this main grid?
 

python/ecl/grid/ecl_grid_generator.py

@@ -50,7 +50,6 @@ def pre_mapaxes_translation(translation, mapaxes):
 
 
 class EclGridGenerator:
-
     _alloc_rectangular = EclPrototype(
         "ecl_grid_obj ecl_grid_alloc_rectangular(int, int, int, double, double, double, int*)",
         bind=False,
@@ -70,7 +69,7 @@ def create_rectangular(cls, dims, dV, actnum=None):
         else:
             if not isinstance(actnum, IntVector):
                 tmp = IntVector(initial_size=len(actnum))
-                for (index, value) in enumerate(actnum):
+                for index, value in enumerate(actnum):
                     tmp[index] = value
                 actnum = tmp
 
@@ -137,7 +136,6 @@ def create_zcorn(
         concave=False,
         faults=False,
     ):
-
         cls.__assert_zcorn_parameters(
             dims,
             dV,
@@ -194,7 +192,6 @@ def create_coord(
         rotate=False,
         misalign=False,
     ):
-
         nx, ny, nz = dims
         dx, dy, dz = dV
 
@@ -236,7 +233,6 @@ def __assert_zcorn_parameters(
         concave,
         faults,
     ):
-
         nx, ny, nz = dims
         dx, dy, dz = dV
 
@@ -588,7 +584,6 @@ def __translate_coord(cls, coord, translation):
     def extract_subgrid(
         cls, grid, ijk_bounds, decomposition_change=False, translation=None
     ):
-
         """
         Extracts a subgrid from the given grid according to the specified
         bounds.

python/ecl/grid/ecl_region.py

@@ -987,7 +987,6 @@ def select_from_layer(self, layer, k, value, intersect=False):
     #################################################################
 
     def scalar_apply_kw(self, target_kw, scalar, func_dict, force_active=False):
-
         """
         Helper function to apply a function with one scalar arg on target_kw.
         """

python/ecl/grid/faults/fault.py

@@ -100,7 +100,7 @@ def __sort_fault_lines(self):
         perm_list.sort(key=lambda x: x[1])
 
         fault_lines = []
-        for (index, d) in perm_list:
+        for index, d in perm_list:
             fault_lines.append(self.__fault_lines[index])
         self.__fault_lines = fault_lines
 

python/ecl/grid/faults/fault_block.py

@@ -133,7 +133,7 @@ def get_edge_polygon(self):
 
         self._trace_edge(x_list, y_list, cell_list)
         p = Polyline()
-        for (x, y) in zip(x_list, y_list):
+        for x, y in zip(x_list, y_list):
             p.addPoint(x, y)
         return p
 

python/ecl/grid/faults/fault_line.py

@@ -89,7 +89,7 @@ def __init_ij_polyline(self):
 
     def __init_polyline(self):
         pl = CPolyline()
-        for (i, j) in self.getIJPolyline():
+        for i, j in self.getIJPolyline():
             x, y, z = self.__grid.getNodeXYZ(i, j, self.__k)
             pl.addPoint(x, y)
         self.__polyline = pl

python/ecl/grid/faults/fault_segments.py

@@ -68,7 +68,7 @@ def __str__(self):
         return self.__segment_map.__str__()
 
     def verify(self):
-        for (C, count) in self.__count_map.iteritems():
+        for C, count in self.__count_map.iteritems():
             if count > 0:
                 d = self.__segment_map[C]
                 if len(d) != count:
@@ -112,7 +112,7 @@ def del_segment(self, segment):
 
     def pop_start(self):
         end_segments = []
-        for (C, count) in self.__count_map.items():
+        for C, count in self.__count_map.items():
             if count == 1:
                 end_segments.append(list(self.__segment_map[C].values())[0])
 
@@ -135,7 +135,7 @@ def pop_next(self, segment):
 
     def print_content(self):
         for d in self.__segment_map.values():
-            for (C, S) in d.iteritems():
+            for C, S in d.iteritems():
                 print(S)
 
 

python/ecl/grid/faults/layer.py

@@ -241,7 +241,7 @@ def cells_equal(self, value):
         j_list = IntVector()
         self._cells_equal(value, i_list, j_list)
         ij_list = []
-        for (i, j) in zip(i_list, j_list):
+        for i, j in zip(i_list, j_list):
             ij_list.append((i, j))
         return ij_list
 

python/ecl/summary/ecl_npv.py

@@ -160,7 +160,7 @@ def compile(self, expression):
         self.code = (
             "trange = self.baseCase.timeRange(self.start, self.end, self.interval)\n"
         )
-        for (key, var) in self.keyList.items():
+        for key, var in self.keyList.items():
             self.code += '%s = self.baseCase.blockedProduction("%s", trange)\n' % (
                 var,
                 key,

python/ecl/summary/ecl_sum.py

@@ -825,7 +825,6 @@ def check_sim_time(self, date):
         return self._check_sim_time(date)
 
     def get_interp_direct(self, key, date):
-
         if not isinstance(date, CTime):
             date = CTime(date)
         return self._get_general_var_from_sim_time(date, key)
@@ -853,7 +852,6 @@ def get_interp(self, key, days=None, date=None):
             if self.check_sim_time(t):
                 return self._get_general_var_from_sim_time(t, key)
             else:
-
                 raise ValueError("date:%s is outside range of simulation data" % date)
         elif date is None:
             if self._check_sim_days(days):

python/ecl/util/geometry/cpolyline.py

@@ -38,7 +38,7 @@ class CPolyline(BaseCClass):
     def __init__(self, name=None, init_points=()):
         c_ptr = self._alloc_new(name)
         super(CPolyline, self).__init__(c_ptr)
-        for (xc, yc) in init_points:
+        for xc, yc in init_points:
             self.addPoint(xc, yc)
 
     @classmethod

python/ecl/util/geometry/geometry_tools.py

@@ -394,17 +394,13 @@ def connectPolylines(polyline, target_polyline):
         p0 = polyline[-1]
         p1 = polyline[-2]
         ray = GeometryTools.lineToRay(p1, p0)
-        for (index, p) in GeometryTools.rayPolygonIntersections(
-            p0, ray, target_polyline
-        ):
+        for index, p in GeometryTools.rayPolygonIntersections(p0, ray, target_polyline):
             d_list.append((GeometryTools.distance(p0, p), [p0, p]))
 
         p0 = polyline[0]
         p1 = polyline[1]
         ray = GeometryTools.lineToRay(p1, p0)
-        for (index, p) in GeometryTools.rayPolygonIntersections(
-            p0, ray, target_polyline
-        ):
+        for index, p in GeometryTools.rayPolygonIntersections(p0, ray, target_polyline):
             d_list.append((GeometryTools.distance(p0, p), [p0, p]))
 
         if len(d_list) == 0:

python/ecl/util/geometry/polyline.py

@@ -40,7 +40,7 @@ def __eq__(self, other):
         if len(self) != len(other):
             return False
 
-        for (p1, p2) in zip(self, other):
+        for p1, p2 in zip(self, other):
             if p1 != p2:
                 return False
 

python/ecl/util/geometry/surface.py

@@ -177,7 +177,6 @@ def copy(self, copy_data=True):
         return self._copy(copy_data)
 
     def write(self, filename):
-
         """
         Will write the surface as an ascii formatted file to @filename.
         """

python/ecl/util/test/ecl_mock/ecl_sum_mock.py

@@ -19,12 +19,11 @@ def createEclSum(
     restart_case=None,
     restart_step=-1,
 ):
-
     ecl_sum = EclSum.restart_writer(
         case, restart_case, restart_step, sim_start, dims[0], dims[1], dims[2]
     )
     var_list = []
-    for (kw, wgname, num, unit) in keys:
+    for kw, wgname, num, unit in keys:
         var_list.append(ecl_sum.addVariable(kw, wgname=wgname, num=num, unit=unit))
 
     # This is a bug! This should not be integer division, but tests are written

python/ecl/util/test/ert_test_runner.py

@@ -19,7 +19,7 @@ def findTestsInDirectory(path, recursive=True, pattern="test*.py"):
         loader = TestLoader()
         test_suite = loader.discover(path, pattern=pattern)
 
-        for (root, dirnames, filenames) in os.walk(path):
+        for root, dirnames, filenames in os.walk(path):
             for directory in dirnames:
                 test_suite.addTests(
                     ErtTestRunner.findTestsInDirectory(

python/ecl/util/test/extended_testcase.py

@@ -178,7 +178,6 @@ def createTestPath(cls, path):
         return os.path.realpath(os.path.join(cls.TESTDATA_ROOT, path))
 
     def assertNotRaises(self, func=None):
-
         context = _AssertNotRaisesContext(self)
         if func is None:
             return context

python/ecl/util/test/test_area.py

@@ -5,7 +5,6 @@
 
 
 class TestArea(BaseCClass):
-
     __test__ = False
 
     _test_area_alloc = EclPrototype(
@@ -34,7 +33,6 @@ class TestArea(BaseCClass):
     )
 
     def __init__(self, test_name, store_area=False, c_ptr=None):
-
         if c_ptr is None:
             c_ptr = self._test_area_alloc(test_name, store_area)
 
@@ -107,7 +105,6 @@ def getFullPath(self, path):
 
 
 class TestAreaContext(object):
-
     __test__ = False
 
     def __init__(self, test_name, store_area=False):

python/ecl/util/test/test_run.py

@@ -126,7 +126,7 @@ def run(self):
 
                 status_list = [status]
                 if status[0]:
-                    for (check_func, arg) in self.check_list:
+                    for check_func, arg in self.check_list:
                         status = check_func(arg)
                         status_list.append(status)
                         if not status[0]:

python/ecl/util/util/vector_template.py

@@ -517,7 +517,7 @@ def permutationSort(self, reverse=False):
 
     def asList(self):
         l = [0] * len(self)
-        for (index, value) in enumerate(self):
+        for index, value in enumerate(self):
             l[index] = value
 
         return l

python/tests/ecl_tests/test_ecl_kw.py

@@ -61,7 +61,7 @@ def kw_test(self, data_type, data, fmt):
         name1 = "file1.txt"
         name2 = "file2.txt"
         kw = EclKW("TEST", len(data), data_type)
-        for (i, d) in enumerate(data):
+        for i, d in enumerate(data):
             kw[i] = d
 
         file1 = cwrap.open(name1, "w")
@@ -138,7 +138,6 @@ def test_fprintf(self):
 
     def test_kw_write(self):
         with TestAreaContext("python/ecl_kw/writing"):
-
             data = [random.random() for i in range(10000)]
 
             kw = EclKW("TEST", len(data), EclDataType.ECL_DOUBLE)
@@ -194,7 +193,7 @@ def test_fprintf_data(self):
                 for elm in tmp:
                     data.append(int(elm))
 
-            for (v1, v2) in zip(data, kw):
+            for v1, v2 in zip(data, kw):
                 self.assertEqual(v1, v2)
 
     def test_sliced_set(self):
@@ -424,7 +423,6 @@ def test_string_alloc(self):
     def test_string_write_read_unformatted(self):
         for str_len in range(1000):
             with TestAreaContext("my_space"):
-
                 kw = EclKW("TEST_KW", 10, EclDataType.ECL_STRING(str_len))
                 for i in range(10):
                     kw[i] = str(i) * str_len
@@ -442,7 +440,6 @@ def test_string_write_read_unformatted(self):
     def test_string_write_read_formatted(self):
         for str_len in range(1000):
             with TestAreaContext("my_space"):
-
                 kw = EclKW("TEST_KW", 10, EclDataType.ECL_STRING(str_len))
                 for i in range(10):
                     kw[i] = str(i) * str_len