diff --git a/.travis.yml b/.travis.yml index f6c08a0..40af7e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ install: - pip install cython ; python_version==3.6 - pip install pandas==0.19 ; python_version==3.5 - pip install -e . + - pip list before_script: flake8 civismlext script: - py.test -vv civismlext diff --git a/CHANGELOG.md b/CHANGELOG.md index cd5d0be..689071f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased + +## [0.2.0] - 2019-11-22 ### Changed - Update tests and requirements.txt to allow sklearn 0.20 and above. (#47) - Instead of boolean flag for `dummy_na`, have None/False (no dummying), diff --git a/README.rst b/README.rst index 0da2d97..f6372e4 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,9 @@ This package contains `scikit-learn`_-compatible estimators for stacking ( ``HyperbandSearchCV``). Usage of these estimators follows the standard sklearn conventions. Here is an -example of using the ``StackedClassifier``:: +example of using the ``StackedClassifier``: + + .. code-block:: python >>> from sklearn.linear_model import LogisticRegression >>> from sklearn.ensemble import RandomForestClassifier @@ -52,7 +54,7 @@ See the doc strings of the various estimators for more information. Contributing ------------ -See ``CONTIBUTING.md`` for information about contributing to this project. +See ``CONTRIBUTING.md`` for information about contributing to this project. License ------- diff --git a/civismlext/__init__.py b/civismlext/__init__.py index c20ae21..444d12a 100644 --- a/civismlext/__init__.py +++ b/civismlext/__init__.py @@ -1,6 +1,19 @@ -from civismlext.stacking import StackedRegressor # NOQA -from civismlext.stacking import StackedClassifier # NOQA -from civismlext.nonnegative import NonNegativeLinearRegression # NOQA -from civismlext.hyperband import HyperbandSearchCV # NOQA -from civismlext.preprocessing import DataFrameETL # NOQA -from civismlext._version import __version__ # NOQA +import pkg_resources + +from civismlext.stacking import StackedRegressor +from civismlext.stacking import StackedClassifier +from civismlext.nonnegative import NonNegativeLinearRegression +from civismlext.hyperband import HyperbandSearchCV +from civismlext.preprocessing import DataFrameETL + + +__version__ = pkg_resources.get_distribution('civisml-extensions').version + +__all__ = [ + 'StackedRegressor', + 'StackedClassifier', + 'NonNegativeLinearRegression', + 'HyperbandSearchCV', + 'DataFrameETL', + '__version__', +] diff --git a/civismlext/_version.py b/civismlext/_version.py deleted file mode 100644 index 850505a..0000000 --- a/civismlext/_version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = '0.1.10' diff --git a/setup.py b/setup.py index b6e7d45..8bcb288 100644 --- a/setup.py +++ b/setup.py @@ -7,10 +7,9 @@ def read(fname): return _in.read() -__version__ = None -exec(read('civismlext/_version.py')) +_VERSION = '0.2.0' -setup(version=__version__, +setup(version=_VERSION, name="civisml-extensions", author="Civis Analytics", author_email="opensource@civisanalytics.com",