You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* Replace refs to Appveyor/Travis with Azure
* Move code of conduct and issue and PR templates to .github
* Fix typos, formatting, old references
* Remove dummy job from Azure
* Remove unused example documentation code
Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -11,6 +11,6 @@ Show here how to reproduce the new behavior (can be a bug fix or a new feature)
11
11
12
12
-[ ] Have you checked our [Contributing](https://github.com/NeurodataWithoutBorders/pynwb/blob/dev/docs/CONTRIBUTING.rst) document?
13
13
-[ ] Have you ensured the PR description clearly describes problem and the solution?
14
-
-[ ] Is your contribution compliant with our coding style? This can be checked running `flake8` from the source directory.
14
+
-[ ] Is your contribution compliant with our coding style? This can be checked running `flake8` from the source directory.
15
15
-[ ] Have you checked to ensure that there aren't other open [Pull Requests](https://github.com/NeurodataWithoutBorders/pynwb/pulls) for the same change?
16
-
-[ ] Have you included the relevant issue number using `#XXX` notation where `XXX` is the issue number?
16
+
-[ ] Have you included the relevant issue number using `#XXX` notation where `XXX` is the issue number?
@@ -67,12 +67,12 @@ See the PyNWB documentation for details http://pynwb.readthedocs.io/en/latest/ge
67
67
Code of Conduct
68
68
===============
69
69
70
-
This project and everyone participating in it is governed by our `code of conduct guidelines <docs/CODE_OF_CONDUCT.rst>`_. By participating, you are expected to uphold this code.
70
+
This project and everyone participating in it is governed by our `code of conduct guidelines <.github/CODE_OF_CONDUCT.rst>`_. By participating, you are expected to uphold this code.
71
71
72
72
Contributing
73
73
============
74
74
75
-
For details on how to contribute to PyNWB see our `contribution guidelines <docs/CONTRIBUTING.rst>`_.
75
+
For details on how to contribute to PyNWB see our `contribution guidelines <docs/CONTRIBUTING.rst>`_.
Copy file name to clipboardExpand all lines: docs/CONTRIBUTING.rst
+12-18Lines changed: 12 additions & 18 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,7 +6,7 @@ How to contribute to NWB:N software and documents
6
6
Code of Conduct
7
7
---------------
8
8
9
-
This project and everyone participating in it is governed by our `code of conduct guidelines <https://github.com/NeurodataWithoutBorders/pynwb/blob/dev/docs/CONTRIBUTING.rst>`_. By participating, you are expected to uphold this code. Please report unacceptable behavior.
9
+
This project and everyone participating in it is governed by our `code of conduct guidelines <https://github.com/NeurodataWithoutBorders/pynwb/blob/dev/.github/CONTRIBUTING.rst>`_. By participating, you are expected to uphold this code. Please report unacceptable behavior.
10
10
11
11
.. _sec-contribution-types:
12
12
@@ -18,11 +18,11 @@ Did you find a bug? or Do you intend to add a new feature or change an existing
18
18
19
19
* **Identify the appropriate repository** for the change you are suggesting:
20
20
21
-
* Use `nwb_schema<https://github.com/NeurodataWithoutBorders/nwb-schema/>`_ for any changes to the NWB:N format schema, schema language, storage and other NWB:N related documents
21
+
* Use `nwb-schema<https://github.com/NeurodataWithoutBorders/nwb-schema/>`_ for any changes to the NWB:N format schema, schema language, storage, and other NWB:N related documents
22
22
* Use `PyNWB <https://github.com/NeurodataWithoutBorders/pynwb>`_ for any changes regarding the PyNWB API and the corresponding documentation
23
23
* Use `MatNWB <https://github.com/NeurodataWithoutBorders/matnwb>`_ for any changes regarding the PyNWB API and the corresponding documentation
24
24
25
-
* **Ensure the feature or change was not already reported** by searching on GitHub under `PyNWB Issues <https://github.com/NeurodataWithoutBorders/pynwb/issues>`_ and `nwh-schema issues <https://github.com/NeurodataWithoutBorders/nwb-schema/issues>`_, respectively .
25
+
* **Ensure the feature or change was not already reported** by searching on GitHub under `PyNWB Issues <https://github.com/NeurodataWithoutBorders/pynwb/issues>`_ and `nwb-schema issues <https://github.com/NeurodataWithoutBorders/nwb-schema/issues>`_, respectively .
26
26
27
27
* If you are unable to find an open issue addressing the problem then open a new issue on the respective repository. Be sure to include:
28
28
@@ -38,25 +38,22 @@ Did you write a patch that fixes a bug or implements a new feature?
See the ``Contributing Patches and Changes`` section below for details.
40
40
41
-
42
41
Do you have questions about NWB:N?
43
42
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44
43
45
-
Join the `NWB:N mailing list <http://visitor.r20.constantcontact.com/manage/optin?v=001nQUq2GTjwCjZxK_V2-6RLElLJO1HMVtoNLJ-wGyDCukZQZxu2AFJmNh6NS0_lGMsWc2w9hZpeNn74HuWdv5RtLX9qX0o0Hy1P0hOgMrkm2NoGAX3VoY25wx8HAtIZwredcCuM0nCUGodpvoaue3SzQ%3D%3D>`_ for updates or ask questions on our `google group <https://groups.google.com/forum/#!forum/neurodatawithoutborders>`_.
46
-
44
+
Ask questions on our `Slack workspace <https://nwb-users.slack.com>`_ or sign up for our `NWB:N mailing list <http://visitor.r20.constantcontact.com/manage/optin?v=001nQUq2GTjwCjZxK_V2-6RLElLJO1HMVtoNLJ-wGyDCukZQZxu2AFJmNh6NS0_lGMsWc2w9hZpeNn74HuWdv5RtLX9qX0o0Hy1P0hOgMrkm2NoGAX3VoY25wx8HAtIZwredcCuM0nCUGodpvoaue3SzQ%3D%3D>`_ for updates.
47
45
48
-
Informal discussions between developers, users, and team?
The https://nwb-users.slack.com slack is currently used mainly for internal discussions between developers, users, and teams.
52
-
49
+
The https://nwb-users.slack.com slack is currently used mainly for informal discussions between developers and users.
53
50
54
51
.. _sec-contributing:
55
52
56
53
Contributing Patches and Changes
57
54
--------------------------------
58
55
59
-
The ``dev`` branches of `PyNWB <https://github.com/NeurodataWithoutBorders/pynwb>`_ and `nwb_schema<https://github.com/NeurodataWithoutBorders/nwb-schema/>`_, are protected; you cannot push to them directly. You must upload your changes by pushing a new branch, then submit your changes to the ``dev`` branch via a `Pull Request <https://help.github.com/articles/creating-a-pull-request>`_. This allows us to conduct automated testing of your contribution, and gives us a space for developers to discuss the contribution and request changes. If you decide to tackle an issue, please make yourself an assignee on the issue to communicate this to the team. Don't worry - this does not commit you to solving this issue. It just lets others know who they should talk to about it.
56
+
The ``dev`` branches of `PyNWB <https://github.com/NeurodataWithoutBorders/pynwb>`_ and `nwb-schema<https://github.com/NeurodataWithoutBorders/nwb-schema/>`_, are protected; you cannot push to them directly. You must upload your changes by pushing a new branch, then submit your changes to the ``dev`` branch via a `Pull Request <https://help.github.com/articles/creating-a-pull-request>`_. This allows us to conduct automated testing of your contribution, and gives us a space for developers to discuss the contribution and request changes. If you decide to tackle an issue, please make yourself an assignee on the issue to communicate this to the team. Don't worry - this does not commit you to solving this issue. It just lets others know who they should talk to about it.
60
57
61
58
From your local copy directory, use the following commands.
62
59
@@ -90,7 +87,6 @@ If you have not already, you will need to clone the repo:
90
87
* If you would like help with your contribution, or would like to communicate contributions that are not ready to merge, submit a PR where the title begins with "[WIP]."
91
88
* **NOTE:** Contributed branches will be removed by the development team after the merge is complete and should, hence, not be used after the pull request is complete.
Source code changes that are purely cosmetic in nature and do not add anything substantial to the stability, functionality, or testability will generally not be accepted unless they have been approved beforehand. One of the main reasons is that there are a lot of hidden costs in addition to writing the code itself, and with the limited resources of the project, we need to optimize developer time. E.g,. someone needs to test and review PRs, backporting of bug fixes gets harder, it creates noise and pollutes the git repo and many other cost factors.
144
139
145
-
146
140
Format Specification Styleguide
147
141
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
148
142
@@ -151,20 +145,20 @@ Format Specification Styleguide
151
145
Python Code Styleguide
152
146
^^^^^^^^^^^^^^^^^^^^^^
153
147
154
-
Python coding style is checked via ``flake8`` for automatic checking of PEP8 style during pull requets.
148
+
Python coding style is checked via ``flake8`` for automatic checking of PEP8 style during pull requests.
155
149
156
150
Endorsement
157
151
-----------
158
152
159
153
Please don’t take the fact that working with an organization (e.g., during a hackathon or via GitHub) as an endorsement of your work or your organization. It’s okay to say e.g., “We worked with XXXXX to advance science” but not e.g., “XXXXX supports our work on NWB”.”
160
154
161
-
Licence and Copyright
155
+
License and Copyright
162
156
=======================
163
157
164
-
See the `Readme<https://github.com/NeurodataWithoutBorders/pynwb#contributing>`_ and correspoding `licence <https://raw.githubusercontent.com/NeurodataWithoutBorders/pynwb/dev/license.txt>`_ files for details about the copyright and licence.
158
+
See the `license<https://raw.githubusercontent.com/NeurodataWithoutBorders/pynwb/dev/license.txt>`_ files for details about the copyright and license.
165
159
166
160
As indicated in the PyNWB license: *“You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the features, functionality or performance of the source code ("Enhancements") to anyone; however, if you choose to make your Enhancements available either publicly, or directly to Lawrence Berkeley National Laboratory, without imposing a separate written license agreement for such Enhancements, then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to install, use, modify, prepare derivative works, incorporate into other computer software, distribute, and sublicense such enhancements or derivative works thereof, in binary and source code form.”*
167
161
168
-
Contributors to the NWB code base are expected to use a permissive, non-copyleft open source license. Typically 3-clause BSD i used, but any compatible license is allowed, the MIT and Apache 2.0 licenses being good alternative choices. The GPL and other copyleft licenses are not allowed due to the consternation it generates across many organizations.
162
+
Contributors to the NWB code base are expected to use a permissive, non-copyleft open source license. Typically 3-clause BSD is used, but any compatible license is allowed, the MIT and Apache 2.0 licenses being good alternative choices. The GPL and other copyleft licenses are not allowed due to the consternation it generates across many organizations.
169
163
170
164
Also, make sure that you are permitted to contribute code. Some organizations, even academic organizations, have agreements in place that discuss IP ownership in detail (i.e., address IP rights and ownership that you create while under the employ of the organization). These are typically signed documents that you looked at on your first day of work and then promptly forgot. We don’t want contributed code to be yanked later due to IP issues.
0 commit comments