#4661 Python: Fix pip-package generation and add instructions

ApplicationCode/GrpcInterface/Python/create_pip_package.txt

@@ -0,0 +1,26 @@
+######################################################################
+# All this is based on the MANIFEST.in and setup.py in Python-folder
+######################################################################
+
+# 1. Make sure dist folder is clear
+del dist/*
+ 
+# 2. Update rips-version tag in setup.py (".N after ResInsight version"). This is generated from setup.py.cmake
+#    So that you for instance have version 2019.08.1 of rips.
+ 
+# 3. Build source distribution
+python setup.py sdist
+ 
+# 4. Test upload to test.pypi.org. This requires a ResInsight testpypi-user and you will be prompted for username and password
+python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+ 
+# 5. Test install rips module.
+pip install --index-url https://test.pypi.org/simple/ rips
+
+# 6. Test the newly installed module
+
+# 8. If anything is wrong, start again from 1. with an incremented rips-version (ResInsightVersion.2+)
+# These incremented versions are just for testpypi and you can reset back to the wanted version before real upload
+
+# 9. Upload to real Pypi. This requires a ResInsight pypi-user.
+python -m twine upload dist/*

ApplicationCode/GrpcInterface/Python/rips/__init__.py

@@ -1,9 +1,9 @@
 name = "rips"
-from .Case import Case
-from .Grid import Grid
-from .Properties import Properties
-from .Instance import Instance
-from .Commands import Commands
-from .PdmObject import PdmObject
-from .View import View
-from .Project import Project
+from rips.Case import Case
+from rips.Grid import Grid
+from rips.Properties import Properties
+from rips.Instance import Instance
+from rips.Commands import Commands
+from rips.PdmObject import PdmObject
+from rips.View import View
+from rips.Project import Project

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 = '9'
+RIPS_DIST_VERSION = '1'
 	
 setup(
     name='rips',
@@ -17,6 +17,6 @@ setup(
     author_email='info@ceetronsolutions.com',
     url='http://www.resinsight.org',
     license=license,
-	include_package_data=True,
-    packages=['rips', 'rips.generated', 'rips.examples', 'rips.tests']
+    packages=['rips'],
+    package_data={'rips': ['*.py', 'generated/*.py', 'PythonExamples/*.py', 'tests/*.py']}
 )

Fwk/AppFwk/.clang-format

@@ -0,0 +1,90 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     130
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '$'
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: true
+JavaScriptQuotes: Leave
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: Inner
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never
+...