Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
shansfolder committed Jan 8, 2018
2 parents acd7909 + 88a3cb9 commit f924f30
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 3 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Change Log

## [Unreleased](https://github.com/zalando/expan/tree/HEAD)

[Full Changelog](https://github.com/zalando/expan/compare/v0.6.5...HEAD)

**Closed issues:**

- Infinitely large confidence intervals produced by group\_sequential\_delta\(\) [\#172](https://github.com/zalando/expan/issues/172)

**Merged pull requests:**

- Merging dev to master for new release [\#175](https://github.com/zalando/expan/pull/175) ([mkolarek](https://github.com/mkolarek))
- AXO-35 implemented estimate\_sample\_size\(\) for estimating sample size … [\#174](https://github.com/zalando/expan/pull/174) ([mkolarek](https://github.com/mkolarek))
- Fix two-sided alpha value in power analysis [\#173](https://github.com/zalando/expan/pull/173) ([shansfolder](https://github.com/shansfolder))
- Docs/update contrib doc [\#171](https://github.com/zalando/expan/pull/171) ([mkolarek](https://github.com/mkolarek))
- Add some parameter checks [\#170](https://github.com/zalando/expan/pull/170) ([shansfolder](https://github.com/shansfolder))
- Make applying bins to data frames more agreeable [\#169](https://github.com/zalando/expan/pull/169) ([gbordyugov](https://github.com/gbordyugov))
- OCTO-2181: Implement over time analysis. Time-based SGA [\#164](https://github.com/zalando/expan/pull/164) ([daryadedik](https://github.com/daryadedik))

## [v0.6.5](https://github.com/zalando/expan/tree/v0.6.5) (2017-10-24)
[Full Changelog](https://github.com/zalando/expan/compare/v0.6.3...v0.6.5)

Expand Down
36 changes: 36 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,42 @@
Change Log
==========

`Unreleased <https://github.com/zalando/expan/tree/HEAD>`__
-----------------------------------------------------------

`Full
Changelog <https://github.com/zalando/expan/compare/v0.6.5...HEAD>`__

**Closed issues:**

- Infinitely large confidence intervals produced by
group\_sequential\_delta()
`#172 <https://github.com/zalando/expan/issues/172>`__

**Merged pull requests:**

- Merging dev to master for new release
`#175 <https://github.com/zalando/expan/pull/175>`__
(`mkolarek <https://github.com/mkolarek>`__)
- AXO-35 implemented estimate\_sample\_size() for estimating sample
size … `#174 <https://github.com/zalando/expan/pull/174>`__
(`mkolarek <https://github.com/mkolarek>`__)
- Fix two-sided alpha value in power analysis
`#173 <https://github.com/zalando/expan/pull/173>`__
(`shansfolder <https://github.com/shansfolder>`__)
- Docs/update contrib doc
`#171 <https://github.com/zalando/expan/pull/171>`__
(`mkolarek <https://github.com/mkolarek>`__)
- Add some parameter checks
`#170 <https://github.com/zalando/expan/pull/170>`__
(`shansfolder <https://github.com/shansfolder>`__)
- Make applying bins to data frames more agreeable
`#169 <https://github.com/zalando/expan/pull/169>`__
(`gbordyugov <https://github.com/gbordyugov>`__)
- OCTO-2181: Implement over time analysis. Time-based SGA
`#164 <https://github.com/zalando/expan/pull/164>`__
(`daryadedik <https://github.com/daryadedik>`__)

`v0.6.5 <https://github.com/zalando/expan/tree/v0.6.5>`__ (2017-10-24)
----------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Some mock-up data:
Documentation
=============

The latest stable version is 0.6.5.
The latest stable version is 0.6.6.

`ExpAn main documentation <http://expan.readthedocs.io/>`__

Expand Down
2 changes: 1 addition & 1 deletion expan/core/version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import subprocess

__version__ = "0.6.5"
__version__ = "0.6.6"

def version_numbers():
return [int(x) for x in __version__.split('.')]
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.6.5
current_version = 0.6.6
commit = True
tag = True

Expand Down

0 comments on commit f924f30

Please sign in to comment.