Skip to content

Commit

Permalink
Merge branch 'master' of github.com:kalekundert/wellmap
Browse files Browse the repository at this point in the history
  • Loading branch information
kalekundert committed Apr 11, 2021
2 parents 336b47a + cb77365 commit fca3f6d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

<!--next-version-placeholder-->

## v3.0.0 (2021-04-11)
### Feature
* Simplify the *extras* argument ([`7558f7a`](https://github.com/kalekundert/wellmap/commit/7558f7ad18917fc3ef9beef60921b7fbe94ff0a3))

### Breaking
* Scipts using the *extras* argument will need to be corrected. ([`7558f7a`](https://github.com/kalekundert/wellmap/commit/7558f7ad18917fc3ef9beef60921b7fbe94ff0a3))

### Documentation
* Fix the Bradford assay example ([`6e06004`](https://github.com/kalekundert/wellmap/commit/6e060040cb40d2611866c2e38d88f74dfadb50a3))

## v2.1.0 (2021-01-13)
### Feature
* Teach wellmap how to print layouts ([`2e1cfe4`](https://github.com/kalekundert/wellmap/commit/2e1cfe4ffb06b69a21a61037b926f60d8175a496))
Expand Down
2 changes: 1 addition & 1 deletion wellmap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
File format for 96-well plate layouts.
"""

__version__ = '2.1.0'
__version__ = '3.0.0'

from .util import *
from .file import *
Expand Down
4 changes: 2 additions & 2 deletions wellmapr/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: wellmapr
Title: File format for 96-well plate layouts
Version: 2.1.0
Version: 3.0.0
Authors@R: as.person(c(
"Kale Kundert <kale@thekunderts.net> [aut, cre]"
))
Expand All @@ -11,7 +11,7 @@ Depends:
Config/reticulate:
list(
packages = list(
list(package = "wellmap", version = "2.1.0", pip = TRUE)
list(package = "wellmap", version = "3.0.0", pip = TRUE)
)
)
Roxygen: list(markdown = TRUE)
Expand Down

0 comments on commit fca3f6d

Please sign in to comment.