Skip to content

Commit 348c57d

Browse files
Merge branch 'master' into bugfix/osi_object
2 parents 8ef23fe + 90ab816 commit 348c57d

21 files changed

+3214
-205
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ addons:
6161
- doxygen-gui
6262
- graphviz
6363
- python3-setuptools
64+
- python3-pip
65+
- python3-wheel
6466

6567

6668
jobs:
@@ -78,6 +80,8 @@ jobs:
7880
- cd ..
7981
- python3 setup.py build
8082
- python3 setup.py sdist
83+
- python3 -m pip install -U pip
84+
- python3 -m pip install .
8185
- cd build
8286
- cmake --build . --target install
8387
- cd ..
@@ -103,6 +107,8 @@ jobs:
103107
- cd ..
104108
- python3 setup.py build
105109
- python3 setup.py sdist
110+
- python3 -m pip install -U pip
111+
- python3 -m pip install .
106112
- cd build
107113
- cmake --build . --target install
108114
- cd ..
@@ -128,6 +134,8 @@ jobs:
128134
- cd ..
129135
- python3 setup.py build
130136
- python3 setup.py sdist
137+
- python3 -m pip install -U pip
138+
- python3 -m pip install .
131139
- cd build
132140
- cmake --build . --target install
133141
- cd ..

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ set(OSI_PROTO_FILES
6666
osi_hostvehicledata.proto
6767
osi_trafficsign.proto
6868
osi_trafficlight.proto
69+
osi_trafficupdate.proto
70+
osi_trafficcommand.proto
6971
osi_roadmarking.proto
7072
osi_lane.proto
7173
osi_featuredata.proto

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Open Simulation Interface (OSI)
22
===============================
33

4-
[![Travis Build Status](https://travis-ci.org/OpenSimulationInterface/open-simulation-interface.svg?branch=master)](https://travis-ci.org/OpenSimulationInterface/open-simulation-interface)
4+
[![Travis Build Status](https://travis-ci.com/OpenSimulationInterface/open-simulation-interface.svg?branch=master)](https://travis-ci.com/OpenSimulationInterface/open-simulation-interface)
55

66
The Open Simulation Interface <sup>[[1]](https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/)</sup> (OSI) is a generic interface based on [Google's protocol buffers](https://developers.google.com/protocol-buffers/) for the environmental perception of automated driving functions in virtual scenarios.
77

doc/howtocontribute.rst

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,82 @@ Introduction
77
------------
88

99
The purpose of this document is to help contributors get started with
10-
the Open Simulation Interface (OSI) codebase.
10+
the ASAM Open Simulation Interface (OSI) codebase.
11+
12+
As an open-source standardisation project, we welcome and encourage the community to submit patches directly to the project. In our collaborative open source environment, standards and methods for submitting changes help reduce the chaos that can result from an active development community.
13+
14+
This document explains how to participate in project conversations, log bugs and enhancement requests, and submit patches to the project so your patch will be accepted quickly in the codebase.
15+
16+
Licensing
17+
---------
18+
19+
OSI uses the Mozilla Public License, v. 2.0. (as found in the LICENSE file in the project’s GitHub repo).
20+
21+
The license tells you what rights you have as a developer, provided by the copyright holder. It is important that the contributor fully understands the licensing rights and agrees to them. Sometimes the copyright holder isn’t the contributor, such as when the contributor is doing work on behalf of a company.
22+
23+
Developer Certification of Origin (DCO)
24+
---------------------------------------
25+
26+
To make a good faith effort to ensure licensing criteria are met, the OSI project requires the Developer Certificate of Origin (DCO) process to be followed.
27+
28+
The DCO is an attestation attached to every contribution made by every developer. In the commit message of the contribution, (described more fully later in this document), the developer simply adds a Signed-off-by statement and thereby agrees to the DCO.
29+
30+
When a developer submits a patch, it is a commitment that the contributor has the right to submit the patch per the license. The DCO agreement is shown below and `online <http://developercertificate.org/>`_.
31+
::
32+
33+
Developer's Certificate of Origin 1.1
34+
35+
By making a contribution to this project, I certify that:
36+
37+
(a) The contribution was created in whole or in part by me and I
38+
have the right to submit it under the open source license
39+
indicated in the file; or
40+
41+
(b) The contribution is based upon previous work that, to the
42+
best of my knowledge, is covered under an appropriate open
43+
source license and I have the right under that license to
44+
submit that work with modifications, whether created in whole
45+
or in part by me, under the same open source license (unless
46+
I am permitted to submit under a different license), as
47+
Indicated in the file; or
48+
49+
(c) The contribution was provided directly to me by some other
50+
person who certified (a), (b) or (c) and I have not modified
51+
it.
52+
53+
(d) I understand and agree that this project and the contribution
54+
are public and that a record of the contribution (including
55+
all personal information I submit with it, including my
56+
sign-off) is maintained indefinitely and may be redistributed
57+
consistent with this project or the open source license(s)
58+
involved.
59+
60+
DCO Sign-Off Methods
61+
--------------------
62+
63+
The DCO requires a sign-off message in the following format appear on each commit in the pull request:
64+
::
65+
66+
Signed-off-by: Firstname Lastname <email@address.com>
67+
68+
The DCO text can either be manually added to your commit body, or you can add either ``-s`` or ``--signoff`` to your usual Git commit commands. If you forget to add the sign-off you can also amend a previous commit with the sign-off by running ``git commit --amend -s``. You can add sign-offs to multiple commits (including commits originally authored by others, if you are authorized to do so) using ``git rebase --signoff``. If you’ve pushed your changes to GitHub already you’ll need to force push your branch after this with ``git push --force-with-lease``.
69+
70+
If you want to be reminded to add the sign-off for commits in your repository, you can add the following commit-message git hook to your repository:
71+
72+
.. code:: shell
73+
74+
#!/bin/sh
75+
#
76+
# Check for DCO/Signed-off-by in message
77+
#
78+
79+
if ! grep -q "^Signed-off-by: " "$1"
80+
then
81+
echo "Aborting commit: Commit message is not signed off" >&2
82+
exit 1
83+
fi
84+
85+
Placing this script into a file called ``.git/hooks/commit-msg`` and making it executable (e.g. using ``chmod a+x .git/hooks/commit-msg`` on unixoid operating systems) will prevent commits without a sign-off.
1186

1287

1388
Reporting issues
@@ -69,7 +144,7 @@ the commits are combined
69144
into one commit and merged into the master branch.
70145
Once a pull request is ready, it is reviewed and
71146
approved, then squashed using the ``--fast-forward`` option of Git in order to
72-
maintain a streamlined Git history.
147+
maintain a streamlined Git history. Pull requests without a Sign-Off message (see DCO above) will not be accepted.
73148

74149
**We also enforce a few hygiene rules**:
75150

0 commit comments

Comments
 (0)