Skip to content

Commit

Permalink
Merge pull request #48 from phausamann/develop
Browse files Browse the repository at this point in the history
Release 0.3.0
  • Loading branch information
phausamann committed Nov 5, 2018
2 parents bacb54b + 76b46f3 commit 8b9bbae
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ The package can be installed from ``pip``::

For the latest version, you can also install from source::

$ git clone https://github.com/phausamann/sklearn-xarray.git
$ cd sklearn-xarray
$ python setup.py install
$ pip install https://github.com/phausamann/sklearn-xarray/archive/master.zip


Example
Expand Down
5 changes: 3 additions & 2 deletions build_tools/conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package:
name: sklearn-xarray
version: 0.1.2
version: 0.3.0

source:
git_rev: "0.1.2"
git_rev: "0.3.0"
git_url: https://github.com/phausamann/sklearn-xarray.git

requirements:
Expand All @@ -18,6 +18,7 @@ requirements:
- scikit-learn
- xarray
- pandas
- six

about:
home: https://github.com/phausamann/sklearn-xarray
Expand Down
4 changes: 1 addition & 3 deletions doc/content/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ The package can be installed from ``pip``::

For the latest version, you can also install from source::

$ git clone https://github.com/phausamann/sklearn-xarray.git
$ cd sklearn-xarray
$ python setup.py install
$ pip install https://github.com/phausamann/sklearn-xarray/archive/master.zip


Testing
Expand Down
9 changes: 7 additions & 2 deletions doc/content/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ What's New
==========


Github master branch
--------------------
v0.3.0 (November 5, 2018)
-------------------------

Breaking changes
~~~~~~~~~~~~~~~~
Expand All @@ -17,6 +17,11 @@ Breaking changes
Enhancements
~~~~~~~~~~~~

- ``EstimatorWrapper`` now directly reflects both the parameters and the
fitted attributes (e.g. ``mean_``) of the underlying estimator. The
``estimator`` attribute is still an instance of the actual estimator but is
treated mostly as just the ``type`` of the instance (It's not stored as
the type for compatibility with ``clone``).
- Added the ``CompatEstimatorWrapper`` which acts like a standard sklearn
estimator (with the wrapped estimator as nested) and does not
present the attributes of the underlying estimator.
Expand Down
4 changes: 2 additions & 2 deletions sklearn_xarray/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
""" Package version information """
__version__ = '0.2.0'
__release__ = '0.2.0-alpha'
__version__ = '0.3.0'
__release__ = '0.3.0-alpha'

0 comments on commit 8b9bbae

Please sign in to comment.