Merge branch 'develop' into merge-from-conan-io

.ecrc

@@ -0,0 +1,19 @@
+{
+    "Version": "2.4.0",
+    "Verbose": false,
+    "Debug": false,
+    "IgnoreDefaults": false,
+    "SpacesAftertabs": false,
+    "NoColor": false,
+    "Exclude": ["^.idea/","^assets/","^docs/","^linter/","^recipes/","\\.md$"],
+    "AllowedContentTypes": [],
+    "PassedFiles": [],
+    "Disable": {
+        "EndOfLine": false,
+        "Indentation": false,
+        "InsertFinalNewline": false,
+        "TrimTrailingWhitespace": false,
+        "IndentSize": true,
+        "MaxLineLength": false
+    }
+}

.editorconfig

@@ -7,15 +7,28 @@ insert_final_newline = true
 indent_style = space
 tab_width = 4
 trim_trailing_whitespace = true
+indent_size = 4
 
-[*.py]
+[{docs,linter,recipes}/**.py]
 max_line_length = 200
 
+[*.py]
+max_line_length = 120
+
 [*.yml]
 tab_width = 2
+indent_size = 2
 
-[{Makefile,Makefile.am,Makefile.in}]
+[dlproject.yaml]
+tab_width = 4
+indent_size = 4
+
+[{Makefile,Makefile.am,Makefile.in,*.mak}]
 indent_style = tab
+indent_size = 8
 
-[*.{diff,patch}]
+[*.{diff,patch,md}]
 trim_trailing_whitespace = false
+
+[*.md]
+max_line_length = 80

.gitattributes

@@ -1,7 +1,7 @@
 *.cmake text eol=lf
 *.conf text eol=lf
 *.diff text eol=lf
-*.md text eol=lf
+*.md text eol=lf -whitespace
 *.patch text eol=lf
 *.py text eol=lf
 *.txt text eol=lf

.gitattributes-merge

@@ -0,0 +1,5 @@
+# Conflicts that should always resolve in favor of Datalogics
+# See the section "Merge Strategies" at the end of
+# https://www.git-scm.com/book/en/v2/Customizing-Git-Git-Attributes
+/README.md merge=ours
+/.github/** merge=ours

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,13 @@
-Specify library name and version:  **lib/1.0**
+- _List changes here_
+-
 
-<!-- This is also a good place to share with all of us **why you are submitting this PR** (specially if it is a new addition to ConanCenter): is it a dependency of other libraries you want to package? Are you the author of the library? Thanks! -->
+#### Fulfills JIRA issue [EXAMPLE-1](https://datalogics-jira.atlassian.net/browse/EXAMPLE-1)
 
+#### Checklist for approving this pull request
 
----
+(**PR Author:** amend this with more conditions if necessary)\
+(**PR Reviewer:** ensure all following items are fulfilled before merging)
 
-- [ ] I've read the [contributing guidelines](https://github.com/conan-io/conan-center-index/blob/master/CONTRIBUTING.md).
-- [ ] I've used a [recent](https://github.com/conan-io/conan/releases/latest) Conan client version close to the [currently deployed](https://github.com/conan-io/conan-center-index/blob/master/.c3i/config_v1.yml#L6).
-- [ ] I've tried at least one configuration locally with the [conan-center hook](https://github.com/conan-io/hooks.git) activated.
+- [ ] The **Pull Request Title** has JIRA issue number, a space, and then a short but descriptive summary.
+- [ ] **Commit messages** are well formed: [A note about Git commit messages](http://www.tpope.net/node/106)
+- [ ] **Automated tests pass**.