diff --git a/CHANGES.rst b/CHANGES.rst index a42c798a9..0f8b93869 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ Latest changes Development version ------------------- +Release 1.1.0 +-------------- + - Fix byte order inconsistency issue during deserialization using joblib.load in cross-endian environment: the numpy arrays are now always loaded to use the system byte order, independently of the byte order of the system @@ -18,8 +21,12 @@ Development version interactively in a IPython session or in Jupyter notebook cell. https://github.com/joblib/joblib/pull/1214 -1.0.1 ------ +- Update vendored loky (from version 2.9 to 3.0) and cloudpickle (from + version 1.6 to 2.0) + https://github.com/joblib/joblib/pull/1218 + +Release 1.0.1 +------------- - Add check_call_in_cache method to check cache without calling function. https://github.com/joblib/joblib/pull/820 @@ -30,8 +37,8 @@ Development version or "ConnectionResetError: [Errno 104] connection reset by peer". https://github.com/joblib/joblib/pull/1133 -1.0.0 ------ +Release 1.0.0 +------------- - Make `joblib.hash` and `joblib.Memory` caching system compatible with `numpy >= 1.20.0`. Also make it explicit in the documentation that users should now diff --git a/LICENSE.txt b/LICENSE.txt index 0f469af82..910537bd3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2008-2016, The joblib developers. +Copyright (c) 2008-2021, The joblib developers. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.rst b/README.rst index d659dbd3f..a17427fb7 100644 --- a/README.rst +++ b/README.rst @@ -48,7 +48,7 @@ Dependencies ============ - Joblib has no mandatory dependencies besides Python (supported versions are - 2.7+ and 3.4+). + 3.6+). - Joblib has an optional dependency on Numpy (at least version 1.6.1) for array manipulation. - Joblib includes its own vendored copy of @@ -134,40 +134,3 @@ but, the following git command may be used to generate the lines:: git log --abbrev-commit --date=short --no-merges --sparse -Licensing ---------- - -joblib is **BSD-licenced** (3 clause): - - This software is OSI Certified Open Source Software. - OSI Certified is a certification mark of the Open Source Initiative. - - Copyright (c) 2009-2011, joblib developpers - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * 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. - - * Neither the name of Gael Varoquaux. nor the names of other joblib - 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 implied warranties of merchantability and fitness for - a particular purpose are disclaimed. In no event shall the copyright - owner or contributors be liable for any direct, indirect, incidental, - special, exemplary, or consequential damages (including, but not - limited to, procurement of substitute goods or services; loss of use, - data, or profits; or business interruption) however caused and on any - theory of liability, whether in contract, strict liability, or tort - (including negligence or otherwise) arising in any way out of the use - of this software, even if advised of the possibility of such - damage.** diff --git a/doc/conf.py b/doc/conf.py index 05e3aa125..ae75b69d1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -69,7 +69,7 @@ # General information about the project. project = 'joblib' -copyright = '2008-2018, Joblib developers' +copyright = '2008-2021, Joblib developers' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/joblib/__init__.py b/joblib/__init__.py index c7867e1ea..4255c86f3 100644 --- a/joblib/__init__.py +++ b/joblib/__init__.py @@ -106,7 +106,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__ = '1.1.0.dev0' +__version__ = '1.1.0' import os diff --git a/setup.cfg b/setup.cfg index e2aeaaace..e88d7b0c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,9 @@ upload = upload upload_docs --upload-dir doc/_build/html [bdist_rpm] doc_files = doc +[bdist_wheel] +universal = 1 + [tool:pytest] doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS addopts =