Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/127/contributing #130

Merged
merged 6 commits into from
May 13, 2019
Merged

Issue/127/contributing #130

merged 6 commits into from
May 13, 2019

Conversation

tallamjr
Copy link
Collaborator

@tallamjr tallamjr commented May 9, 2019

Major updates to CONTRIBUTING.md file

In addition to Code Style section, further subsections have been added
such as:

    * Creating an Issue
    * Submitting a Pull Request
    * Running Tests Locally
    * Package Versioning

Some sections anticipate adoption of certain practises that have not
been implemented yet, such as CHANGELOG, but this should be in place in
due course. Therefore this commit links to #129

Closes #127

Adding Github ISSUE/PR templates

These files allow for templating of issues and pull requests on Github
for easier contributions.

The layout is akin to:
https://github.com/tallamjr/dotfiles/issues/new/choose
where one chooses an issue option, BUG, FEATURE_REQUEST, or just make a
general issue.

In addition, a PULL_REQUEST_TEMPLATE has been created to allow for
consistent documentation of what a PR achieves.

Fixes #126

Moving file to top level of repo to be a single file that describes how
users can contribute to the snmachine project
These files allow for templating of issues and pull requests on Github
for easier contributions.

The layout is akin to:
	https://github.com/tallamjr/dotfiles/issues/new/choose
where one chooses an issue option, BUG, FEATURE_REQUEST, or just make a
general issue.

In addition, a PULL_REQUEST_TEMPLATE has been created to allow for
consistent documentation of what a PR achieves.

Fixes #126
In addition to Code Style section, further subsections have been added
such as:

	* Creating an Issue
	* Submitting a Pull Request
	* Running Tests Locally
	* Package Versioning

Some sections anticipate adoption of certain practises that have not
been implemented yet, such as CHANGELOG, but this should be in place in
due course. Therefore this commit links to #129

Closes #127
Copy link
Collaborator

@Catarina-Alves Catarina-Alves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what I can see we will be able to choose between:

  • Bug
  • Feature request
  • General

Did I understand it? I just want to make sure it is possible to create an issue that is not a bug nor a feature request. I am thinking about times when we might want to re-do some parts of the code (eg: replace a certain name for a more explanatory one) and that is not a bug nor a feature.

@rbiswas4
Copy link
Member

@tallamjr very good idea. Of what I just saw: I suggest changing
- [ ] I am up to date with `dev` branch via `git rebase dev` at the time of this PR
which will only look at the user's local branch to
- [ ] I am up to date with `dev` branch via `git pull --rebase origin dev` at the time of this PR
which will pull the latest dev branch from github.

A warning might be in order, as sometimes rebase can get into a merge problem, which might discourage a user. If this happens, the user can always do git rebase --abort and submit the PR without checking the box. In any case, the rebase needs to happen at the time the PR is merged.

@tallamjr
Copy link
Collaborator Author

tallamjr commented May 13, 2019

Did I understand it? I just want to make sure it is possible to create an issue that is not a bug nor a feature request. I am thinking about times when we might want to re-do some parts of the code (eg: replace a certain name for a more explanatory one) and that is not a bug nor a feature.

Yep @Catarina-Alves . The user will see a screen like this :
image

Where if you don't want to open a [BUG] or [FEATURE] issue you can "Open a regular issue" at the bottom. This is effectively what General is, which just opens a plain issue but gives the user a button to select this option.

In light of @rbiswas4 comments, I will update this PR with those suggested changes 👍

@tallamjr tallamjr changed the title Issue/127/contributing [WIP] Issue/127/contributing May 13, 2019
@Catarina-Alves
Copy link
Collaborator

Yep @Catarina-Alves . The use will see a screen like this :
image

Where if you don't want to open a [BUG] or [FEATURE] issue you can "Open a regular issue" at the bottom. This is effectively what General is, which just opens a plain issue but gives the user a button to select this option.

Cool, I had not noticed those words in the bottom.

In light of @rbiswas4 comments, I will update this PR with those suggested changes 👍

After reviewing your changes that I will approve it.

Moving instructions for how to update the contributors repo with
snmachine into a hidden comment, as opposed to being inline with the
check mark.

Since it is outlined in CONTRIBUTING.md that one should fork snmachine
and then make changes in their local repo, it is expected that they
should update the dev branch from "upstream"
As well as fixing typo and upper-casing github --> Github
@tallamjr tallamjr changed the title [WIP] Issue/127/contributing Issue/127/contributing May 13, 2019
Copy link
Collaborator

@Catarina-Alves Catarina-Alves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good.

@tallamjr tallamjr merged commit 508af41 into dev May 13, 2019
@tallamjr tallamjr deleted the issue/127/contributing branch May 13, 2019 19:15
@tallamjr
Copy link
Collaborator Author

Closes #126 , #127

@tallamjr tallamjr mentioned this pull request May 20, 2019
tallamjr added a commit that referenced this pull request May 20, 2019
A [MINOR] version bump is required following the recent merged PR of #122
which changed variable names and functionality around use of Chi^2

In addition, PRs #130 and #118 would warrant a [PATCH] bump too.

Therefore, a bump from v1.2.0 to v1.3.2 was carried out
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants