Skip to content

Commit

Permalink
Merge branch 'master' into merge-pr62-to-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
tailaiw committed Feb 12, 2020
2 parents f3d6a3e + 9e9b86b commit 5d55b03
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
# The short X.Y version.
version = "0.6"
# The full version, including alpha/beta/rc tags.
release = "0.6.0-dev.10+pr.58"
release = "0.6.0-dev.11+pr.63"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 4 additions & 0 deletions docs/releasehistory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Version 0.6.0-dev
- Added an example of DoubleRollingAggregate with different window sizes to the documentation (0.6.0-dev.5+pr.43)
- Optimized release process by publishing package to PyPI through GitHub Actions (0.6.0-dev.7+pr.54, 0.6.0-dev.8+pr.56, 0.6.0-dev.9+pr.57, 0.6.0-dev.10+pr.58)

Version 0.5.3 (Feb 12, 2020)
===================================
- Quick hotfix to avoid errors caused by statsmodels v0.11 by requiring statsmodels dependency <0.11

Version 0.5.2 (Jan 14, 2020)
===================================
- Formalized the management of releases and pre-releases, including rules of branches and versioning
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = adtk
version = 0.6.0-dev.10
version = 0.6.0-dev.11
author = Arundo Analytics, Inc.
maintainer = Tailai Wen
maintainer_email = [email protected]
Expand Down Expand Up @@ -33,7 +33,7 @@ install_requires =
pandas>=0.23
matplotlib>=3.0
scikit-learn>=0.20
statsmodels>=0.9
statsmodels>=0.9,<0.11
packaging>=17.0
tabulate>=0.8

Expand Down
2 changes: 1 addition & 1 deletion src/adtk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
"""

__version__ = "0.6.0-dev.10+pr.58"
__version__ = "0.6.0-dev.11+pr.63"

0 comments on commit 5d55b03

Please sign in to comment.