Skip to content

Commit

Permalink
Merge pull request scikit-optimize#21 from scikit-optimize/master
Browse files Browse the repository at this point in the history
Fix upstream changes
  • Loading branch information
holgern authored Feb 2, 2020
2 parents 757f9fb + fd09905 commit c3c0486
Show file tree
Hide file tree
Showing 10 changed files with 193 additions and 18 deletions.
129 changes: 129 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"title": "scikit-optimize/scikit-optimize",
"description": "Scikit-Optimize, or skopt, is a simple and efficient library to minimize (very) expensive and noisy black-box functions. It implements several methods for sequential model-based optimization. skopt aims to be accessible and easy to use in many contexts.",
"creators": [
{
"affiliation": "Wild Tree Tech",
"name": "Head, Tim"
},
{
"affiliation": "Google Brain",
"name": "Kumar, Manoj"
},
{
"name": "Nahrstaedt, Holger",
"orcid": "0000-0002-4796-1082"
},
{
"affiliation": "ULi\u00e8ge",
"name": "Louppe, Gilles"
},
{
"affiliation": "Saarland University",
"name": "Shcherbatyi, Iaroslav"
},
{
"name": "fcharras"
},
{
"name": "Z\u00e9 Vin\u00edcius"
},
{
"name": "cmmalone"
},
{
"name": "Christopher Schr\u00f6der"
},
{
"name": "nel215"
},
{
"affiliation": "@yldio",
"name": "Nuno Campos"
},
{
"name": "Todd Young"
},
{
"affiliation": "Politecnico di Milano",
"name": "Stefano Cereda"
},
{
"name": "Thomas Fan"
},
{
"name": "rene-rex"
},
{
"affiliation": "Columbia University",
"name": "Kejia (KJ) Shi"
},
{
"affiliation": "Biomedical Informatics Department, Emory School of Medicine",
"name": "Justus Schwabedal"
},
{
"name": "carlosdanielcsantos"
},
{
"affiliation": "Hvass Laboratories",
"name": "Hvass-Labs"
},
{
"affiliation": "Technical University of Munich",
"name": "Mikhail Pak"
},
{
"name": "SoManyUsernamesTaken"
},
{
"affiliation": "UC Berkeley",
"name": "Fred Callaway"
},
{
"name": "Lo\u00efc Est\u00e8ve"
},
{
"affiliation": "ENS de Cachan - Paris Saclay University",
"name": "Lilian Besson"
},
{
"name": "Mehdi Cherti"
},
{
"affiliation": "Paderborn University",
"name": "Karlson Pfannschmidt"
},
{
"affiliation": "Toptal",
"name": "Fabian Linzberger"
},
{
"affiliation": "@point8",
"name": "Christophe Cauet"
},
{
"affiliation": "10clouds",
"name": "Anna Gut"
},
{
"affiliation": "Columbia University Data Science Institute",
"name": "Andreas Mueller"
},
{
"affiliation": "DFKI",
"name": "Alexander Fabisch"
}
],
"keywords": [
"bayesopt",
"optimization",
"scientific-computing",
"python",
"machine-learning",
"hyperparameter",
"bayesian-optimization"
],
"license": "bsd-license",
"upload_type": "software"
}
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
# Release history
## Version 0.7.1

### New features

* Sphinx documentation
* notebooks are replaced by sphinx-gallery
* New StringEncoder, can be used in Categoricals
* Remove string conversion in Identity
* dtype can be set in Integer and Real

### Bug fixes

* Fix categorical space (issue #821)
* int can be set as dtype to fix issue #790

### Maintenance

* Old pdoc scripts are removed and replaced by sphinx

## Version 0.7

### New features
Expand Down
21 changes: 10 additions & 11 deletions LICENSE.md → LICENSE
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
New BSD License
BSD 3-Clause License

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

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

a. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

b. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

c. Neither the name of the scikit-optimize developers nor the names of
its contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.
3. Neither the name of the scikit-optimize developers nor the names of
its contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand Down
8 changes: 6 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

|Logo|

|Travis Status| |CircleCI Status| |binder| |gitter| |Zenodo DOI|
|pypi| |conda| |Travis Status| |CircleCI Status| |binder| |gitter| |Zenodo DOI|

Scikit-Optimize
===============
Expand Down Expand Up @@ -38,7 +38,7 @@ Important links
Install
-------

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

Expand Down Expand Up @@ -183,6 +183,10 @@ If your employer allows you to work on scikit-optimize during the day and would
recognition, feel free to add them to the "Made possible by" list.


.. |pypi| image:: https://img.shields.io/pypi/v/scikit-optimize.svg
:target: https://pypi.python.org/pypi/scikit-optimize
.. |conda| image:: https://anaconda.org/conda-forge/scikit-optimize/badges/version.svg
:target: https://anaconda.org/conda-forge/scikit-optimize
.. |Travis Status| image:: https://travis-ci.org/scikit-optimize/scikit-optimize.svg?branch=master
:target: https://travis-ci.org/scikit-optimize/scikit-optimize
.. |CircleCI Status| image:: https://circleci.com/gh/scikit-optimize/scikit-optimize/tree/master.svg?style=shield&circle-token=:circle-token
Expand Down
6 changes: 3 additions & 3 deletions build_tools/circle/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ MSG="Pushing the docs for revision for branch: $CIRCLE_BRANCH, commit $CIRCLE_SH
echo "Copying built files"
git clone -b master "[email protected]:scikit-optimize/scikit-optimize.github.io" deploy
cd deploy
git rm -r notebooks/*
git rm -r rtd/*
git rm -r beta/*
git rm -r space
git rm -r optimizer
git rm -r learning
cd ..
for entry in ${HOME}/doc/skopt/*
do
Expand Down
1 change: 1 addition & 0 deletions doc/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ <h4 class="sk-landing-call-header">News</h4>
<li><strong>On-going development:</strong>
<a href="whats_new.html"><strong>What's new</strong> (Changelog)</a>
</li>
<li><strong>Feb 2020.</strong> scikit-optimize 0.7.1 (<a href="whats_new/v0.7.1.html">Changelog</a>).
<li><strong>Jan 2020.</strong> scikit-optimize 0.7 (<a href="whats_new/v0.7.html">Changelog</a>).
<li><strong>April 2018.</strong> scikit-optimize 0.6 (<a href="whats_new/v0.6.html">Changelog</a>).
<li><strong>Mar 2018.</strong> scikit-optimize 0.5 (<a href="whats_new/v0.5.html">Changelog</a>).
Expand Down
1 change: 1 addition & 0 deletions doc/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Release notes for all scikit-optimize releases are linked in this this page.
.. toctree::
:maxdepth: 1

Version 0.7.1 <whats_new/v0.7.1.rst>
Version 0.7 <whats_new/v0.7.rst>
Version 0.6 <whats_new/v0.6.rst>
Version 0.5 <whats_new/v0.5.rst>
Expand Down
22 changes: 22 additions & 0 deletions doc/whats_new/v0.7.1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Version 0.7.1
=============

New features
------------

* Sphinx documentation
* notebooks are replaced by sphinx-gallery
* New StringEncoder, can be used in Categoricals
* Remove string conversion in Identity
* dtype can be set in Integer and Real

Bug fixes
---------

* Fix categorical space (issue #821)
* int can be set as dtype to fix issue #790

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

* Old pdoc scripts are removed and replaced by sphinx
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
description='Sequential model-based optimization toolbox.',
long_description=open('README.rst').read(),
url='https://scikit-optimize.github.io/',
license='BSD',
license='BSD 3-clause "New" or "Revised License"',
author='The scikit-optimize contributors',
packages=['skopt', 'skopt.learning', 'skopt.optimizer', 'skopt.space',
'skopt.learning.gaussian_process'],
Expand Down
2 changes: 1 addition & 1 deletion skopt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# 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.7"
__version__ = "0.7.1"

if __SKOPT_SETUP__:
import sys
Expand Down

0 comments on commit c3c0486

Please sign in to comment.