Commit 13830eec authored by Mark Hymers's avatar Mark Hymers
Browse files

Merge branch 'mh/prepare_1.1.1' into 'master' 

Prepare 1.1.1

See merge request analysis/sails!66
parents 2429f3c3 71e1b755

NEWS.md

+3 −0
Original line number Diff line number Diff line 
# 1.1.1

 * Fix sklearn version in requirements.txt



# 1.1.0



 * Add ability to use some sklearn estimators when fitting models

doc/source/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ author = 'Andrew Quinn, Mark Hymers' 
# The short X.Y version.

version = '1.1'

# The full version, including alpha/beta/rc tags.

release = '1.1.0'

release = '1.1.1'



# The language for content autogenerated by Sphinx. Refer to documentation

# for a list of supported languages.

requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ numpy>=1.16 
scipy>=1.1.0

matplotlib>=3.0.2

h5py>=2.8.0

sklearn>=0.20

sklearn

sphinx_rtd_theme

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ with open(path.join(this_directory, 'README.rst'), encoding='utf-8') as f: 


name = 'sails'

version = '1.1'

release = '1.1.0'

release = '1.1.1'



setup(

    name=name,