Python: move examples, tests and generated inside rips folder so they are packaged in rips pip-package

ApplicationCode/GrpcInterface/CMakeLists.cmake

@@ -110,16 +110,16 @@ foreach(proto_file ${PROTO_FILES})
     )
     
     if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
-        set(rips_proto_python "generated/${proto_file}_pb2.py")
+        set(rips_proto_python "rips/generated/${proto_file}_pb2.py")
-        set(rips_grpc_python "generated/${proto_file}_pb2_grpc.py")
+        set(rips_grpc_python "rips/generated/${proto_file}_pb2_grpc.py")
 
         add_custom_command(
             OUTPUT "${GRPC_PYTHON_SOURCE_PATH}/${rips_proto_python}" "${GRPC_PYTHON_SOURCE_PATH}/${rips_grpc_python}"
             COMMAND ${PYTHON_EXECUTABLE}
             ARGS -m grpc_tools.protoc
                 -I "${rips_proto_path}"
-                --python_out "${GRPC_PYTHON_SOURCE_PATH}/generated"
+                --python_out "${GRPC_PYTHON_SOURCE_PATH}/rips/generated"
-                --grpc_python_out "${GRPC_PYTHON_SOURCE_PATH}/generated"
+                --grpc_python_out "${GRPC_PYTHON_SOURCE_PATH}/rips/generated"
                 "${rips_proto}"
             DEPENDS "${rips_proto}"
             COMMENT "Generating ${rips_proto_python} and ${rips_grpc_python}"
@@ -147,7 +147,7 @@ endforeach(proto_file)
 if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
     list(APPEND GRPC_PYTHON_SOURCES
         ${GRPC_PYTHON_GENERATED_SOURCES}
-		"generated/RiaVersionInfo.py"
+		"rips/generated/RiaVersionInfo.py"
         "rips/__init__.py"
 		"rips/App.py"
 		"rips/Case.py"
@@ -156,25 +156,25 @@ if (PYTHON_EXECUTABLE AND EXISTS ${PYTHON_EXECUTABLE})
 		"rips/Project.py"
 		"rips/Properties.py"
         "rips/Instance.py"	
-        "examples/CommandExample.py"
+        "rips/examples/CommandExample.py"
-        "examples/CaseInfoStreamingExample.py"
+        "rips/examples/CaseInfoStreamingExample.py"
-		"examples/SoilPorvAsync.py"
+		"rips/examples/SoilPorvAsync.py"
-		"examples/SoilPorvSync.py"
+		"rips/examples/SoilPorvSync.py"
-        "examples/SelectedCases.py"
+        "rips/examples/SelectedCases.py"
-        "examples/AllCases.py"
+        "rips/examples/AllCases.py"
-		"examples/SetGridProperties.py"
+		"rips/examples/SetGridProperties.py"
-		"examples/GridInformation.py"
+		"rips/examples/GridInformation.py"
-		"examples/InputPropTestSync.py"
+		"rips/examples/InputPropTestSync.py"
-		"examples/InputPropTestAsync.py"
+		"rips/examples/InputPropTestAsync.py"
-		"examples/SoilAverage.py"
+		"rips/examples/SoilAverage.py"
-		"examples/SoilAverageNoComm.py"
+		"rips/examples/SoilAverageNoComm.py"
-        "tests/test_cases.py"
+        "rips/tests/test_cases.py"
-		"tests/test_commands.py"
+		"rips/tests/test_commands.py"
-		"tests/test_grids.py"
+		"rips/tests/test_grids.py"
-		"tests/test_properties.py"
+		"rips/tests/test_properties.py"
-		"tests/test_project.py"
+		"rips/tests/test_project.py"
-		"tests/conftest.py"
+		"rips/tests/conftest.py"
-		"tests/dataroot.py"
+		"rips/tests/dataroot.py"
 		"requirements.txt"
 		"setup.py.cmake"
 		"README.md"
@@ -194,7 +194,7 @@ list ( APPEND GRPC_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 list ( APPEND GRPC_CPP_SOURCES ${SOURCE_GROUP_SOURCE_FILES})
 
 CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.py.cmake
-                ${GRPC_PYTHON_SOURCE_PATH}/generated/RiaVersionInfo.py
+                ${GRPC_PYTHON_SOURCE_PATH}/rips/generated/RiaVersionInfo.py
 )
 CONFIGURE_FILE( ${GRPC_PYTHON_SOURCE_PATH}/setup.py.cmake
                 ${GRPC_PYTHON_SOURCE_PATH}/setup.py

ApplicationCode/GrpcInterface/Python/rips/App.py

@@ -2,7 +2,7 @@ import grpc
 import os
 import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 from Empty_pb2 import Empty
 

ApplicationCode/GrpcInterface/Python/rips/Case.py

@@ -4,7 +4,7 @@ import sys
 from .Grid import Grid
 from .Properties import Properties
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 import Case_pb2
 import Case_pb2_grpc

ApplicationCode/GrpcInterface/Python/rips/Commands.py

@@ -2,7 +2,7 @@ import grpc
 import os
 import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 from Empty_pb2 import Empty
 import Commands_pb2 as Cmd

ApplicationCode/GrpcInterface/Python/rips/Grid.py

@@ -2,7 +2,7 @@ import grpc
 import os
 import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 import Grid_pb2
 import Grid_pb2_grpc

ApplicationCode/GrpcInterface/Python/rips/Instance.py

@@ -5,7 +5,7 @@ import socket
 import logging
 import time
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 import RiaVersionInfo
 

ApplicationCode/GrpcInterface/Python/rips/Project.py

@@ -5,7 +5,7 @@ import sys
 from .Case import Case
 from .Commands import Commands
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 from Empty_pb2 import Empty
 import Project_pb2

ApplicationCode/GrpcInterface/Python/rips/Properties.py

@@ -2,7 +2,7 @@ import grpc
 import os
 import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../generated'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'generated'))
 
 import Properties_pb2
 import Properties_pb2_grpc

ApplicationCode/GrpcInterface/Python/rips/ResInsight.py

@@ -1,78 +0,0 @@
-import grpc
-import os
-import sys
-import socket
-import logging
-
-sys.path.insert(1, os.path.join(sys.path[0], '../generated'))
-
-import RiaVersionInfo
-
-from AppInfo import AppInfo
-from Commands import Commands
-from Project import Project
-
-class Instance:
-    @staticmethod
-    def is_port_in_use(port):
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.settimeout(0.2)
-            return s.connect_ex(('localhost', port)) == 0
-    
-    @staticmethod
-    def launch():
-        port = 50051
-        portEnv = os.environ.get('RESINSIGHT_GRPC_PORT')
-        if portEnv:
-            port = int(portEnv)
-        
-        resInsightExecutable = os.environ.get('RESINSIGHT_EXECUTABLE')
-        if resInsightExecutable is None:
-            print('Error: Could not launch any ResInsight instances because RESINSIGHT_EXECUTABLE is not set')
-            return None
-        
-        while Instance.is_port_in_use(port):
-            port += 1
-
-        print('Port ' + str(port))
-        print('Trying to launch', resInsightExecutable)
-        pid = os.spawnl(os.P_NOWAIT, resInsightExecutable, " --grpcserver " + str(port))
-        print(pid)
-        return Instance(port)
-    
-    @staticmethod
-    def find(startPort = 50051, endPort = 50071):
-        portEnv = os.environ.get('RESINSIGHT_GRPC_PORT')
-        if portEnv:
-            startPort = int(portEnv)		
-            endPort   = startPort + 20 
-        
-        for tryPort in range(startPort, endPort):
-            if Instance.is_port_in_use(tryPort):
-                return Instance(tryPort)
-                
-        print('Error: Could not find any ResInsight instances responding between ports ' + str(startPort) + ' and ' + str(endPort))
-        return None
-
-    def __init__(self, port = 50051):
-        logging.basicConfig()
-        location = "localhost:" + str(port)
-        self.channel = grpc.insecure_channel(location)
-
-        # Main version check package
-        self.appInfo     = AppInfo(self.channel)
-        try:
-            majorVersionOk = self.appInfo.majorVersion() == int(RiaVersionInfo.RESINSIGHT_MAJOR_VERSION)
-            minorVersionOk = self.appInfo.minorVersion() == int(RiaVersionInfo.RESINSIGHT_MINOR_VERSION)
-            if not (majorVersionOk and minorVersionOk):
-                raise Exception('Version of ResInsight does not match version of Python API')
-        except grpc.RpcError as e:
-            if e.code() == grpc.StatusCode.UNAVAILABLE:
-                print('Info: Could not find any instances at port ' + str(port))
-        except Exception as e:
-            print('Error:', e)
-                
-        # Service packages
-        self.commands   = Commands(self.channel)
-        self.project    = Project(self.channel)
-    

ApplicationCode/GrpcInterface/Python/rips/examples/AllCases.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 resInsight  = rips.Instance.find()

ApplicationCode/GrpcInterface/Python/rips/examples/CaseInfoStreamingExample.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 resInsight  = rips.Instance.find()

ApplicationCode/GrpcInterface/Python/rips/examples/CommandExample.py

@@ -1,7 +1,7 @@
 import sys
 import os
 import tempfile
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 # Load instance

ApplicationCode/GrpcInterface/Python/rips/examples/GridInformation.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 
 import rips
 

ApplicationCode/GrpcInterface/Python/rips/examples/InputPropTestAsync.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 import time
 

ApplicationCode/GrpcInterface/Python/rips/examples/InputPropTestSync.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 import time
 

ApplicationCode/GrpcInterface/Python/rips/examples/SelectedCases.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 
 import rips
 

ApplicationCode/GrpcInterface/Python/rips/examples/SetGridProperties.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 resInsight     = rips.Instance.find()

ApplicationCode/GrpcInterface/Python/rips/examples/SoilAverage.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 import itertools
 import time

ApplicationCode/GrpcInterface/Python/rips/examples/SoilPorvAsync.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 def createResult(soilChunks, porvChunks):

ApplicationCode/GrpcInterface/Python/rips/examples/SoilPorvSync.py

@@ -1,6 +1,6 @@
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 resInsight = rips.Instance.find()

ApplicationCode/GrpcInterface/Python/rips/tests/conftest.py

@@ -3,7 +3,7 @@ import sys
 import os
 import getopt
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 _rips_instance = None

ApplicationCode/GrpcInterface/Python/rips/tests/dataroot.py

@@ -0,0 +1 @@
+PATH = "../../../../TestModels"

ApplicationCode/GrpcInterface/Python/rips/tests/test_cases.py

@@ -2,7 +2,7 @@ import sys
 import os
 import pytest 
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 import dataroot

ApplicationCode/GrpcInterface/Python/rips/tests/test_commands.py

@@ -3,7 +3,7 @@ import os
 import tempfile
 import pytest
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 import dataroot

ApplicationCode/GrpcInterface/Python/rips/tests/test_grids.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 import dataroot

ApplicationCode/GrpcInterface/Python/rips/tests/test_project.py

@@ -2,7 +2,7 @@ import sys
 import os
 import pytest 
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 import dataroot

ApplicationCode/GrpcInterface/Python/rips/tests/test_properties.py

@@ -2,7 +2,7 @@ import sys
 import os
 import pytest
 
-sys.path.insert(1, os.path.join(sys.path[0], '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '../../'))
 import rips
 
 import dataroot

ApplicationCode/GrpcInterface/Python/setup.py.cmake

@@ -6,7 +6,7 @@ with open('README.md') as f:
 with open('LICENSE') as f:
 	license = f.read()
 
-RIPS_DIST_VERSION = '2'
+RIPS_DIST_VERSION = '3'
 	
 setup(
     name='rips',
@@ -17,5 +17,5 @@ setup(
     author_email='info@ceetronsolutions.com',
     url='http://www.resinsight.org',
     license=license,
-    packages=find_packages(exclude=('tests', 'docs', '__pycache', 'examples'))
+    packages=find_packages(exclude=('docs', '__pycache__'))
 )

ApplicationCode/GrpcInterface/Python/tests/dataroot.py

@@ -1 +0,0 @@
-PATH = "../../../TestModels"