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

Fix/793 #870

Merged
merged 3 commits into from
Mar 14, 2015
Merged

Fix/793 #870

merged 3 commits into from
Mar 14, 2015

Conversation

SchwarzEM
Copy link
Contributor

Added URLs and brief descriptions for khmer-relevant documentation in doc/introduction.txt, pointing to http://khmer-protocols.readthedocs.org and http://khmer-recipes.readthedocs.org, with brief descriptions of their content; hopefully, fixes issue #793.

@ged-jenkins
Copy link

Can one of the admins verify this patch?

1 similar comment
@ged-jenkins
Copy link

Can one of the admins verify this patch?

@SchwarzEM
Copy link
Contributor Author

  • Is it mergeable?
  • Did it pass the tests?
  • If it introduces new functionality in scripts/ is it tested?
    Check for code coverage with make clean diff-cover
  • Is it well formatted? Look at make pep8, make diff_pylint_report,
    make cppcheck, and make doc output. Use make format and manual
    fixing as needed.
  • Did it change the command-line interface? Only additions are allowed
    without a major version increment. Changing file formats also requires a
    major version number increment.
  • Is it documented in the ChangeLog?
    http://en.wikipedia.org/wiki/Changelog#Format
  • Was a spellchecker run on the source code and documentation after
    changes were made?

@SchwarzEM
Copy link
Contributor Author

(I only added the ChangeLog entry after the initial push, since I was following documentation rather naively; in the future I should know better!)

@ctb
Copy link
Member

ctb commented Mar 14, 2015

Thanks, looks good. One thing to avoid in the future is reformatting lines unnecessarily - most of your
changes were to spacing/end of line in otherwise untouched text, which present as differences on github. I'm going to run the tests pro-forma but since you didn't touch any code I expect them to pass :)

@ctb
Copy link
Member

ctb commented Mar 14, 2015

ok to test

@ctb
Copy link
Member

ctb commented Mar 14, 2015

(I also ran a spellchecker. All looks good.)

ctb added a commit that referenced this pull request Mar 14, 2015
@ctb ctb merged commit 8b37c21 into dib-lab:master Mar 14, 2015
@SchwarzEM
Copy link
Contributor Author

On Mar 14, 2015, at 8:50 AM, C. Titus Brown notifications@github.com wrote:

Thanks, looks good. One thing to avoid in the future is reformatting lines unnecessarily - most of your
changes were to spacing/end of line in otherwise untouched text, which present as differences on github.

Aha.  OK, from now on I'll watch for that...

git is clearly going to take me more time to work with before it becomes second nature, but at least now I've gotten a *taste* of the Brown lab github workflow.  ;)

--Erich

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