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

Doc/frenzy 2 #1247

Merged
merged 38 commits into from
Aug 14, 2015
Merged

Doc/frenzy 2 #1247

merged 38 commits into from
Aug 14, 2015

Conversation

mr-c
Copy link
Contributor

@mr-c mr-c commented Aug 12, 2015

re-do of #1241

mr-c and others added 25 commits August 3, 2015 17:04
Conflicts:
	Makefile
	doc/contributors.rst
	doc/index.rst
	lib/kmer_hash.cc
	lib/kmer_hash.hh
	sandbox/collect-reads.py
	sandbox/correct-reads.py
	sandbox/estimate_optimal_hash.py
	sandbox/saturate-by-median.py
	sandbox/sweep-files.py
	sandbox/sweep-reads.py
	scripts/abundance-dist-single.py
	scripts/count-overlap.py
	scripts/do-partition.py
	scripts/filter-abund-single.py
	scripts/filter-abund.py
	scripts/find-knots.py
	scripts/interleave-reads.py
	scripts/load-into-countgraph.py
	scripts/make-initial-stoptags.py
	scripts/normalize-by-median.py
	scripts/split-paired-reads.py
	scripts/trim-low-abund.py
	setup.py
	tests/test_countgraph.py
	tests/test_scripts.py
@@ -109,6 +109,7 @@ ready for review::
http://en.wikipedia.org/wiki/Changelog#Format
- [ ] Was a spellchecker run on the source code and documentation after
changes were made?
- [ ] Does the script respect streaming IO? (Is it tested for streaming IO?)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Some pull requests don't have scripts, therefore 'the script' doesn't make sense.

@@ -54,13 +54,13 @@ Pipelines
---------

All khmer scripts used by a published recommended analysis pipeline must be
included in scripts/ and meet the standards therein implied.
included in `scripts/` and meet the standards therein implied.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

please also use double backticks in this file for code + pathname snippets

@SensibleSalmon
Copy link
Contributor

retest this please

@SensibleSalmon
Copy link
Contributor

@mr-c Updated, ready for merge

@mr-c
Copy link
Contributor Author

mr-c commented Aug 13, 2015

LGTM, thanks!

mr-c added a commit that referenced this pull request Aug 14, 2015
@mr-c mr-c merged commit 88818c0 into master Aug 14, 2015
@mr-c mr-c deleted the doc/frenzy_2 branch August 14, 2015 01:38
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.

2 participants