Skip to content

Commit

Permalink
Merge pull request AIDASoft#72 from vvolkl/upstream-changes
Browse files Browse the repository at this point in the history
Upstream changes from AIDASoft
  • Loading branch information
JavierCVilla authored Mar 15, 2019
2 parents bcc3547 + c01243e commit 54181e7
Show file tree
Hide file tree
Showing 73 changed files with 1,332 additions and 102 deletions.
34 changes: 34 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Contribution Guidelines for PODIO


## Pull Requests

When making a `Pull Request` please explain what and why things were
changed. Please include a short description in the
BEGINRELEASENOTES/ENDRELEASENOTES block, which will appear in the
doc/ReleaseNotes.md, once a new tag is made.

We are happy if you create pull-requests also if you feature is not ready, yet.
Please mark them as such by adding `[WIP]` to the start of the title. The purpose
of this is, for example, that you want to let other people know you are working
on a given issue. For these work-in-progress pull-request, we propose to have a
check list of things that still need to be done.

## Issue tracking

Use the GitHub issue tracker. Reference the issues that you are working on.
If you notice an issue, consider first creating an issue and then refering to it
in your pull-request and commit messages with `#[issue-id]`.

## Coding Conventions

* Your code should not introduce any new warnings, and fix as many existing warnings as possible

## Git workflow

For an explanation of the git(hub) workflow please see
[here](https://github.com/andresailer/tutorial#working-updating-pushing). We
basically follow the ["No Switch
Yard"](https://root.cern.ch/suggested-work-flow-distributed-projects-nosy)
workflow

9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
!!!IMPORTANT!!!: To facilitate faster and easier response to your issue please provide in addition to the description of the issue also the following information

- OS version: e.g. SLC6
- Compiler version: e.g GCC 6.2
- PODIO version: tag or commit ID, or GitHub branch
- Reproduced by: exact steps to reproduce the problem: checkout, setup environment (Geant, ROOT versions, iLCSoft release), cmake, build, run...
- Input: link to input files if applicable
- Output: full build and run log output
- Goal: A short description of what you are trying to achieve
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@


BEGINRELEASENOTES
- Thank you for writing the text to appear in the release notes. It will show up
exactly as it appears between the two bold lines
- ...

ENDRELEASENOTES
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build
install
*pyc
*pyc
*~
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8)

project(podio)
set( podio_VERSION_MAJOR 0 )
set( podio_VERSION_MINOR 4 )
set( podio_VERSION_PATCH 1 )
set( podio_VERSION_MINOR 9 )
set( podio_VERSION_PATCH 0 )
set( podio_VERSION "${podio_VERSION_MAJOR}.${podio_VERSION_MINOR}" )

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
Expand Down
Loading

0 comments on commit 54181e7

Please sign in to comment.