Merge pull request #1 from root-project/master

Merge root-project/root head into fork

Author: josephmckenna

.ci/format_script.sh

@@ -15,14 +15,16 @@ if [ "$RESULT_OUTPUT" == "no modified files to format" ] \
 else
   echo "clang-format failed."
   echo "To reproduce it locally please run"
-  echo -e "\tgit checkout $TRAVIS_BRANCH"
+  echo -e "\tgit checkout $TRAVIS_PULL_REQUEST_BRANCH"
   echo -e "\tgit-clang-format --commit $BASE_COMMIT --diff --binary $(which clang-format)"
   echo "$RESULT_OUTPUT"
 
   echo -e "\n\nPlease apply the code formatting changes without bloating the history."
   echo -e "\tConsider running:"
-  echo -e "\t\tgit checkout $TRAVIS_BRANCH"
-  echo -e "\t\tgit rebase -i --autosquash -x 'git-clang-format-7 master && git commit -a --amend --no-edit' master"
+  echo -e "\t\tgit checkout $TRAVIS_PULL_REQUEST_BRANCH"
+  echo -e "\t\tgit rebase -i -x \"git-clang-format-7 master && git commit -a --allow-empty --fixup=HEAD\" --strategy-option=theirs origin/master"
+  echo -e "\t Then inspect the results with git log --oneline"
+  echo -e "\t Then squash without poluting the history with: git rebase --autosquash -i master"
 
   exit 1
 fi

.gitattributes

@@ -11,6 +11,7 @@
 *.vsct  eol=crlf
 *.resx  eol=crlf
 *.vsixmanifest  eol=crlf
+tree/dataframe/test/RCsvDS_test_win.csv  eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary

.github/CODEOWNERS

@@ -10,8 +10,7 @@
 # Coarse-grained ownership
 * @Axel-Naumann
 /bindings/ @etejedor
-/core/ @Axel-Naumann
-/core/ @pcanal
+/core/ @Axel-Naumann @pcanal
 /documentation/ @couet
 /fonts/ @bellenot
 /geom/ @agheata
@@ -34,20 +33,15 @@
 /roofit/ @lmoneta @hageboeck
 /rootx/ @Axel-Naumann
 /sql/ @pcanal @linev
-/tmva/ @lmoneta @ashlaban @stwunsch
+/tmva/ @lmoneta @ashlaban @stwunsch @sitongan
 /tree/ @pcanal
 /tutorials/ @couet
-/tree/dataframe @dpiparo @bluehood
+/tree/dataframe @eguiraud
 
 # Projects that span over several code modules:
 /bindings/r/ @omazapa
-/core/base/ @pcanal
-/core/cont/ @pcanal
-/core/imt/ @dpiparo
-/core/lz4/ @pcanal
-/core/lzma/ @pcanal
-/core/multiproc/ @gganis
-/core/thread/ @pcanal
+/core/imt/ @eguiraud
+/core/multiproc/ @eguiraud
 /graf2d/cocoa/ @TimurP
 /graf3d/eve/ @osschar
 /graf3d/eve7/ @osschar @linev

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to get an issue fixed
+title: ''
+labels: bug
+---
+
+- [ ] Checked for duplicates
+<!--
+Please search in
+* [GitHub](https://github.com/root-project/root/issues?q=is%3Aissue)
+* AND [Jira](https://sft.its.cern.ch/jira/issues/?jql=project %3D ROOT)
+for existing reports of your issue.
+
+If you find one, you are very welcome to add to the existing report, for instance "issue still exists in today's master".
+-->
+
+### Describe the bug
+<!--
+A clear and concise description of what the wrong behavior is.
+-->
+
+### Expected behavior
+<!--
+A clear and concise description of what you expected to happen.
+-->
+
+### To Reproduce
+<!--
+Steps to reproduce the behavior:
+1. Your code that triggers the issue: at least a part; ideally something we can run ourselves.
+2. Don't forget to attach the required input files!
+3. How to run your code and / or build it, e.g. `root myMacro.C`, ...
+-->
+
+### Setup
+<!--
+1. ROOT version
+2. Operating system
+3. How you obtained ROOT, such as `dnf install` / binary download / you built it yourself.
+-->
+
+### Additional context
+<!--
+Add any other context about the problem here.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Propose a new feature for ROOT
+title: ''
+labels: new feature
+---
+
+### Is your feature request related to a problem? Please describe.
+<!--
+A clear and concise description of what the problem is. E.g "I always have to [...] when I want to [...]"
+-->
+
+### Describe the solution you'd like
+<!--
+A clear and concise description of what you want to happen.
+-->
+
+### Describe alternatives you've considered
+<!--
+Can you think of alternative solutions or features?
+-->
+
+### Additional context
+<!--
+Add any other context or screenshots about the feature requested here.
+-->

.github/ISSUE_TEMPLATE/improvement_report.md

@@ -0,0 +1,36 @@
+---
+name: Improvement
+about: Suggest something that could be improved.
+title: ''
+labels: improvement
+---
+
+### Explain what you would like to see improved
+<!--
+Explain what isn't as good as it could be and why
+-->
+
+### Optional: share how it could be improved
+<!--
+If you already have an idea what we could improve, then please tell us.
+-->
+
+### To Reproduce
+<!--
+Steps to reproduce the behavior:
+1. Your code that triggers the issue: at least a part; ideally something we can run ourselves.
+2. Don't forget to attach the required input files!
+3. How to run your code: build it / `root myMacro.C` / ...
+-->
+
+### Setup
+<!--
+1. ROOT version
+2. Operating system
+3. How you obtained ROOT, such as `dnf install` / binary download / you built it yourself.
+-->
+
+### Additional context
+<!--
+Add any other context about the problem here.
+-->

.github/workflows/emailnotify.yml

@@ -0,0 +1,29 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "notify"
+  notify:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - name: Email Notification
+      uses: Axel-Naumann/gitnotifier-ghaction@master
+      with:
+        githubToken: ${{ secrets.GHTOKEN }}
+        to: axel@cern.ch
+        from: root-project-git-notifier@outlook.com
+        smtp: smtp.office365.com
+        port: 587
+        login: root-project-git-notifier@outlook.com
+        password: ${{ secrets.SMTPPW }}

.github/workflows/registerIssuesForTriage.yml

@@ -0,0 +1,16 @@
+on:
+  issues:
+    types: opened
+
+jobs:
+  assign_issue_to_project:
+    runs-on: ubuntu-latest
+    name: Add new issues to the triage project
+    steps:
+    - name: Create new project card with issue
+      id: list
+      uses: qmacro/action-add-issue-to-project-column@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        project: 'Triage'
+        column: 'Needs triage'

.gitignore

@@ -1,5 +1,6 @@
-# roottest is its own repo
+# roottest & rootbench are their own repos
 roottest
+rootbench
 
 # MacOS Xcode
 xcuserdata
@@ -25,9 +26,11 @@ CMakeLists.txt.user
 .settings/*
 .cproject
 .project
+.externalToolBuilders
 
 # Vim
 *.swp
 
 # Other Stuff
 tags
+*.d

.travis.yml

@@ -20,11 +20,6 @@ matrix:
   # Abort all builds on a single failing matrix entry.
   fast_finish: true
 
-  exclude:
-    # Note: Workaround travis-ci/travis-ci#4681
-    # Exclude default job which lacks our included environment variables.
-    - os: linux
-
   include:
     - env: TOOL=clang-format
       script: &format_script