From e2385b154127767fea0d61f0ba18a772e4ad20e2 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 12 Feb 2021 09:08:27 -0600 Subject: [PATCH] Update DJ for bool support and adjust contribution wording on PR's. --- contributing.md | 7 +++++-- requirements.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contributing.md b/contributing.md index e1fa6a5..b593df1 100644 --- a/contributing.md +++ b/contributing.md @@ -14,10 +14,11 @@ There is primarily 3 things to consider when looking to contribute. After considering the above, you may comment on the issue you'd like to help fix and a maintainer will assign it to you. -## What is the proper pull request (PR) etiquette? +## What is the proper etiquette for proposing changes as contribution? -What is generally expected from new pull requests are the following: +What is generally expected from new contributions are the following: +- Any proposed contributor changes should be introduced in the form of a pull request (PR) from their fork. - Proper branch target specified. The following is generally the available branches that can be targeted: - `master` or `main`: Represents the single source of truth and the latest in completed development. - `pre`: Represents the source at the point of the last stable release. @@ -30,6 +31,8 @@ What is generally expected from new pull requests are the following: 3. No style errors e.g. PEP8, etc. 4. Similar or better code coverage - Additional documentation to reflect new feature or behavior introduced. +- A contributor should not approve or merge their own PR. +- Reviewer suggestions or feedback should not be directly committed to a branch on contributor's fork. A less intrusive way to collaborate would be for the reviewer to PR to the contributor's fork/branch that is associated with the main PR currently in review. Maintainers will also ensure that PR's have the appropriate assignment for reviewer, milestone, and project. diff --git a/requirements.txt b/requirements.txt index 8a4c61a..da70a02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ flask pyjwt[crypto] -datajoint==0.13.dev4 +datajoint==0.13.dev5 datajoint_connection_hub