Skip to content
This repository was archived by the owner on Feb 28, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[run]
omit =
# this file comes from versioneer and we don’t test it
*/_version.py
skopt/__init__.py
# these are our tests, don't count them towards coverage
skopt/tests/*

Expand Down
2 changes: 2 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Scikit-Optimize is a community effort. Contributors include, in alphabetical ord
* [Manoj Kumar][mechcoder]
* [Gilles Louppe][glouppe]
* [Katie Malone][cmmalone]
* [Holger Nahrstaedt][holgern]
* [nel215][nel215]
* [Mikhail Pak][mp4096]
* [Iaroslav Shcherbatyi](iaroslav-ai)
Expand All @@ -35,3 +36,4 @@ The scikit-optimize logo was a contribution by
[thomasjpfan]: https://github.com/thomasjpfan
[mirca]: http://mirca.github.io/
[iaroslav-ai]: http://iaroslav-ai.github.io/
[holgern]: https://github.com/holgern
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
# Release history
## Version 0.7

### New features

* Models queue has now a customizable size (model_queue_size).
* Add log-uniform prior to Integer space
* Support for plotting categorical dimensions

### Bug fixes

* Allow BayesSearchCV to work with sklearn 0.21
* Reduce the amount of deprecation warnings in unit tests

### Maintenance

* joblib instead of sklearn.externals.joblib
* Improve travis CI unit tests (Different sklearn version are checked)
* Added `versioneer` support, to keep things simple and to fix pypi deploy

## Version 0.6

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
New BSD License

Copyright (c) 2016 - scikit-optimize developers.
Copyright (c) 2016-2020 The scikit-optimize developers.

All rights reserved.

Expand Down
5 changes: 3 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include *.md
include *.rst
include versioneer.py
include skopt/_version.py
recursive-include doc *
recursive-include examples *
include README.rst
5 changes: 2 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Important links
Install
-------

The latest released version of scikit-optimize is v0.6, which you can install
The latest released version of scikit-optimize is v0.7, which you can install
with:
::

Expand Down Expand Up @@ -136,7 +136,6 @@ The release procedure is almost completely automated. By tagging a new release
travis will build all required packages and push them to PyPI. To make a release
create a new issue and work through the following checklist:

* update the version tag in ``setup.py``
* update the version tag in ``__init__.py``
* update the version tag mentioned in the README
* check if the dependencies in ``setup.py`` are valid or need unpinning
Expand All @@ -147,7 +146,7 @@ create a new issue and work through the following checklist:

Before making a release we usually create a release candidate. If the next
release is v0.X then the release candidate should be tagged v0.Xrc1 in
``setup.py`` and ``__init__.py``. Mark a release candidate as a "pre-release"
``__init__.py``. Mark a release candidate as a "pre-release"
on GitHub when you tag it.


Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# The short X.Y version
version = __version__
# The full version, including alpha/beta/rc tags
release = "v" + str(float(__version__.split("+")[0][1:]) + 0.1)
release = __version__

# -- General configuration ---------------------------------------------------

Expand Down
12 changes: 11 additions & 1 deletion doc/whats_new/v0.7.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ Version 0.7
New features
------------

* Models queue has now a customizable size (model_queue_size).
* Add log-uniform prior to Integer space
* Support for plotting categorical dimensions

Bug fixes
---------
* Fixed build with newest scikit-learn

* Allow BayesSearchCV to work with sklearn 0.21
* Reduce the amount of deprecation warnings in unit tests

Maintenance
-----------

* joblib instead of sklearn.externals.joblib
* Improve travis CI unit tests (Different sklearn version are checked)
* Added `versioneer` support, to keep things simple and to fix pypi deploy
5 changes: 2 additions & 3 deletions skopt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def f(x):

Run the tests by executing `pytest` in the top level directory.
"""
import sys
try:
# This variable is injected in the __builtins__ by the build
# process. It is used to enable importing subpackages of sklearn when
Expand All @@ -71,10 +70,10 @@ def f(x):
# Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
# 'X.Y.dev0' is the canonical version of 'X.Y.dev'
#
__version__ = "0.7rc4"

__version__ = "0.7"

if __SKOPT_SETUP__:
import sys
sys.stderr.write('Partial import of skopt during the build process.\n')
# We are not importing the rest of scikit-optimize during the build
# process, as it may not be compiled yet
Expand Down