Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Russell committed Jun 14, 2016
2 parents 120323b + 20f8fbe commit f0d6eec
Show file tree
Hide file tree
Showing 6 changed files with 4,139 additions and 19 deletions.
5 changes: 4 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@
- Add generated schema for WS253, WS254
- Various minor fixes for the command line interface.

## 0.4.5 - (un-released)
## 0.4.5 - (2016-06-14)
- Remove hard-dependency on datomic-pro.
Library users will now have to choose which flavour (and version)
of datomic to include.
- Made all functions in the `pseudoace.binning` module public.
- EDN log sorting script now allows parallel execution.
- Annotated models for WS255 (including generated EDN schema)
26 changes: 16 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,27 +123,33 @@ This process re-uses the [leiningen deployment tools][12]:

* Checkout the `develop` branch if not already checked-out.

* Update changes entries in the CHANGES.md file
* Update changes entries in the CHANGES.md file

* Replace "un-released" in the latest version entry with the current date.
* Replace "un-released" in the latest version entry with the current date.

* Commit and push all changes.
* Change the version from `MAJOR.MINOR.PATCH-SNAPSHOT` to `MAJOR.MINOR.PATCH`
in `project.clj`.

* Merge the `develop` branch into to `master` (via a github pull
request or directly using git)
* Commit and push all changes.

* Checkout the `master` branch.

* Run:
* Merge the `develop` branch into to `master` (via a github pull
request or directly using git)

`lein release`
* Run:

`lein deploy`

* Checkout the `develop` branch.

* Merge the `master` branch back into `develop`.
* Merge the `master` branch back into `develop`.

* Change the version from `MAJOR.MINOR.PATCH` to `MAJOR.MINOR.PATCH-SNAPSHOT`
in `project.clj`.

* Update `CHANGES.md` with the next
version number and a "back to development" stanza, e.g:
* Update `CHANGES.md` with the next
version number and a "back to development" stanza, e.g:

```markdown
## 0.3.2 - (unreleased)
Expand Down
Loading

0 comments on commit f0d6eec

Please sign in to comment.