merge

Merge branch 'master' of github.com:ropensci/taxa

# Conflicts:
#	DESCRIPTION

DESCRIPTION

@@ -6,7 +6,7 @@ Description: Provides taxonomic classes for
     with data. Methods provided are "taxonomically aware", in
     that they know about ordering of ranks, and methods that
     filter based on taxonomy also filter associated data.
-Version: 0.1.0.9116
+Version: 0.2.0
 Authors@R: c(
     person("Scott", "Chamberlain", role = c("aut", "cre"), email = "[email protected]"),
     person("Zachary", "Foster", role = "aut", email = "[email protected]")

NEWS.md

@@ -1,4 +1,4 @@
-taxa [current]
+taxa 0.2.0
 ==========
 
 ### Bug fixes
@@ -18,6 +18,11 @@ taxa [current]
 * Added `n_supertaxa_1` function to get number of immediate supertaxa (always 1 or 0).
 * Added `branches` function to go with `roots`, `leaves`, and `stems`. ([issue #56](https://github.com/ropensci/taxa/issues/56))
 * Added `internodes` and `is_internode` functions to go with `roots`, `leaves`, `branches`, and `stems`. USeful for removing uninformative taxonomic ranks/taxa.
+* Started to incorporate ability for `taxon`, `taxon_name`, `taxon_id`, `taxon_rank`, and `taxa` to handle `NULL` inputs as first class citizens to handle cases when you have essentially a blank taxon (use case comes from `taxize` package) [#95](https://github.com/ropensci/taxa/issues/95) [#107](https://github.com/ropensci/taxa/issues/107)
+* data parsers: Put long, often unused columns last ([issue #93](https://github.com/ropensci/taxa/issues/93))
+* When parsing classifications that have per-taxon info add input id column ([issue #92](https://github.com/ropensci/taxa/issues/92))
+* New function `classification` as an abstraction to get either hierarchy of taxon indexes, names, or ids ([issue #57](https://github.com/ropensci/taxa/issues/57))
+* New function `get_data_frame` for both `Taxonomy` and `Taxmap` objects that wraps around `get_data` to coerce into a `data.frame`. ([issue #58](https://github.com/ropensci/taxa/issues/58)) ([PR #105](https://github.com/ropensci/taxa/issues/105))
 
 ### Changes
 

cran-comments.md

@@ -1,7 +1,7 @@
 ## Test environments
 
-* local OS X install, R 3.4.1 patched
-* ubuntu 12.04 (on travis-ci), R 3.4.0
+* local OS X install, R 3.4.3 patched
+* ubuntu 12.04 (on travis-ci), R 3.4.3
 * win-builder (devel and release)
 
 ## R CMD check results
@@ -16,12 +16,12 @@
 
 ## Reverse dependencies
 
-This is a new submission, so there are no reverse dependencies.
+There are no reverse dependencies.
 
 ---
 
-This is a new release. I have read and agree to the the CRAN policies at
-https://cran.r-project.org/web/packages/policies.html
+This version includes a number of bug fixes and improvements - of 
+particular importance is a fix for failing CRAN checks.
 
 Thanks!
 Scott Chamberlain