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 Oct 7, 2021
2 parents e2c5eec + 72eb478 commit 3a6d174
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 @@ -6,6 +6,16 @@ code, while major version upgrades (e.g. 1.1 to 2.0) might.

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

## v3.0.1 (2021-10-01)
### Fix
* Allow multiple patterns to define the same well ([`d0d852c`](https://github.com/kalekundert/wellmap/commit/d0d852c6fcffc47ec063ffaab163fe0dbcdff13b))

### Documentation
* Add link the semantic versioning website ([`eb2f5f2`](https://github.com/kalekundert/wellmap/commit/eb2f5f23d1847c60a9f037e312a030dad4552b30))
* Include the change log in the online docs ([`727f03f`](https://github.com/kalekundert/wellmap/commit/727f03fdfc255dc133a6198f96c20569ee9f386f))
* Revise manuscript after peer review ([`0823802`](https://github.com/kalekundert/wellmap/commit/08238027018c3afddd0bad5b2d4339800329b8d6))
* Briefly describe each alternative sfotware ([`336b47a`](https://github.com/kalekundert/wellmap/commit/336b47a1267589bce760f36da832d4aaf60258bd))

## v3.0.0 (2021-04-11)
### Feature
* Simplify the *extras* argument ([`7558f7a`](https://github.com/kalekundert/wellmap/commit/7558f7ad18917fc3ef9beef60921b7fbe94ff0a3))
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__ = '3.0.0'
__version__ = '3.0.1'

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: 3.0.0
Version: 3.0.1
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 = "3.0.0", pip = TRUE)
list(package = "wellmap", version = "3.0.1", pip = TRUE)
)
)
Roxygen: list(markdown = TRUE)
Expand Down

0 comments on commit 3a6d174

Please sign in to comment.