Skip to content

Commit bc5e12d

Browse files
committedFeb 20, 2016
CONTRIBUTING: bug reporting information
1 parent 3b81dd5 commit bc5e12d

File tree

2 files changed

+98
-46
lines changed

2 files changed

+98
-46
lines changed
 

‎CONTRIBUTING

-46
This file was deleted.

‎CONTRIBUTING.rst

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
.. Github links to this from the new issue page
2+
https://github.com/m-labs/artiq/issues/new. Keep relevant information for
3+
bug reporting at the top.
4+
5+
Reporting Issues/Bugs
6+
=====================
7+
8+
Thanks for `reporting issues to ARTIQ
9+
<https://github.com/m-labs/artiq/issues/new>`_! You can also discuss issues and
10+
ask questions on IRC (the `#m-labs channel on freenode
11+
<https://webchat.freenode.net/?channels=m-labs>`_) or on the `mailing list
12+
<https://ssl.serverraum.org/lists/listinfo/artiq>`_.
13+
14+
The best bug reports are those which contain sufficient information. With
15+
accurate and comprehensive context, an issue can be resolved quickly and
16+
efficiently. Please consider adding the following data to your issue
17+
report if possible:
18+
19+
* A clear and unique summary that fits into one line. Also check that
20+
this issue has not jet been reported. If it has, add additional information there.
21+
* Precise steps to reproduce (list of actions that leads to the issue)
22+
* Expected behavior (what should happen)
23+
* Actual behavior (what happens instead)
24+
* Logging message, trace backs, screen shots where relevant
25+
* Components involved:
26+
27+
* Operating system
28+
* Conda version
29+
* ARTIQ version (package or git commit id, versions for bitstream, BIOS,
30+
runtime and host software)
31+
* Hardware involved
32+
33+
For in-depth information on bug reporting, see:
34+
35+
http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
36+
https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines
37+
38+
39+
Contributing Code
40+
=================
41+
42+
ARTIQ welcomes contributions. Write bite-sized patches that can stand alone,
43+
clean them up, write proper commit messages, add docstrings and unittests. Then
44+
``git rebase`` them onto the current master or merge the current master. Verify
45+
that the testsuite passes. Then prepare a pull request or send patches to the
46+
`mailing list <https://ssl.serverraum.org/lists/listinfo/artiq>`_ to be
47+
discussed. Expect your contribution to be held up to coding standards (e.g. use
48+
``flake8`` to check yourself).
49+
50+
Copyright and Sign-Off
51+
----------------------
52+
53+
Authors retain copyright of their contributions to ARTIQ, but whenever possible
54+
should use the GNU GPL version 3 license for them to be merged.
55+
56+
Works of US government employees are not copyrighted but can also be merged.
57+
58+
We've introduced a "sign-off" procedure on patches that are being sent around.
59+
60+
The sign-off is a simple line at the end of the explanation for the
61+
patch, which certifies that you wrote it or otherwise have the right to
62+
pass it on as an open-source patch. The rules are pretty simple: if you
63+
can certify the below:
64+
65+
Developer's Certificate of Origin (1.1 from the Linux kernel)
66+
67+
By making a contribution to this project, I certify that:
68+
69+
(a) The contribution was created in whole or in part by me and I
70+
have the right to submit it under the open source license
71+
indicated in the file; or
72+
73+
(b) The contribution is based upon previous work that, to the best
74+
of my knowledge, is covered under an appropriate open source
75+
license and I have the right under that license to submit that
76+
work with modifications, whether created in whole or in part
77+
by me, under the same open source license (unless I am
78+
permitted to submit under a different license), as indicated
79+
in the file; or
80+
81+
(c) The contribution was provided directly to me by some other
82+
person who certified (a), (b) or (c) and I have not modified
83+
it.
84+
85+
(d) I understand and agree that this project and the contribution
86+
are public and that a record of the contribution (including all
87+
personal information I submit with it, including my sign-off) is
88+
maintained indefinitely and may be redistributed consistent with
89+
this project or the open source license(s) involved.
90+
91+
then you just add a line saying
92+
93+
Signed-off-by: Random J Developer <random@developer.example.org>
94+
95+
using your legal name (sorry, no pseudonyms or anonymous contributions.)
96+
97+
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited
98+
and are licensed under GNU GPL version 3.

0 commit comments

Comments
 (0)
Please sign in to comment.