From cb692957e4807d387e2e20f7fa9f9294d47ed5b4 Mon Sep 17 00:00:00 2001 From: Vova Vv Date: Thu, 21 Feb 2019 17:30:54 +0100 Subject: [PATCH 01/11] cherry-pick fix url --- rasa_nlu/train.py | 2 +- rasa_nlu/utils/__init__.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rasa_nlu/train.py b/rasa_nlu/train.py index 9ad5823c5650..4cb896d30209 100644 --- a/rasa_nlu/train.py +++ b/rasa_nlu/train.py @@ -180,6 +180,6 @@ def do_train(cfg, # type: RasaNLUModelConfig cmdline_args.project, cmdline_args.fixed_model_name, cmdline_args.storage, - data_endpoint=data_endpoint, + training_data_endpoint=data_endpoint, num_threads=cmdline_args.num_threads) logger.info("Finished training") diff --git a/rasa_nlu/utils/__init__.py b/rasa_nlu/utils/__init__.py index e8cb5d541eea..580be8c09f6e 100644 --- a/rasa_nlu/utils/__init__.py +++ b/rasa_nlu/utils/__init__.py @@ -90,8 +90,9 @@ def list_directory(path): If the path points to a file, returns the file. This is a recursive implementation returning files in any depth of the path.""" - if not isinstance(path, six.string_types): - raise ValueError("Resourcename must be a string type") + if not isinstance(path, str): + raise ValueError("Resourcename must be a string type. " + "Got `{}` instead".format(path)) if os.path.isfile(path): return [path] From abe3273bebc2ccedff47a5ffba924baa04096b9d Mon Sep 17 00:00:00 2001 From: Vova Vv Date: Thu, 21 Feb 2019 17:33:16 +0100 Subject: [PATCH 02/11] change error string --- rasa_nlu/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasa_nlu/utils/__init__.py b/rasa_nlu/utils/__init__.py index 580be8c09f6e..3db07a7edf4d 100644 --- a/rasa_nlu/utils/__init__.py +++ b/rasa_nlu/utils/__init__.py @@ -92,7 +92,7 @@ def list_directory(path): if not isinstance(path, str): raise ValueError("Resourcename must be a string type. " - "Got `{}` instead".format(path)) + "Got `{}` instead".format(type(path))) if os.path.isfile(path): return [path] From 4363971483717492badca9121de1a2b46531bc20 Mon Sep 17 00:00:00 2001 From: ricwo Date: Fri, 22 Feb 2019 10:12:28 +0100 Subject: [PATCH 03/11] Update rasa_nlu/utils/__init__.py Co-Authored-By: Ghostvv --- rasa_nlu/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasa_nlu/utils/__init__.py b/rasa_nlu/utils/__init__.py index 3db07a7edf4d..025b5c8d9950 100644 --- a/rasa_nlu/utils/__init__.py +++ b/rasa_nlu/utils/__init__.py @@ -91,7 +91,7 @@ def list_directory(path): implementation returning files in any depth of the path.""" if not isinstance(path, str): - raise ValueError("Resourcename must be a string type. " + raise ValueError("`resource_name` must be a string type. " "Got `{}` instead".format(type(path))) if os.path.isfile(path): From 4266f3028bf7131e38c6926504195f64e364dae4 Mon Sep 17 00:00:00 2001 From: Vova Vv Date: Fri, 22 Feb 2019 16:39:16 +0100 Subject: [PATCH 04/11] fix py27 string --- rasa_nlu/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasa_nlu/utils/__init__.py b/rasa_nlu/utils/__init__.py index 025b5c8d9950..dc8b17d6af03 100644 --- a/rasa_nlu/utils/__init__.py +++ b/rasa_nlu/utils/__init__.py @@ -90,7 +90,7 @@ def list_directory(path): If the path points to a file, returns the file. This is a recursive implementation returning files in any depth of the path.""" - if not isinstance(path, str): + if not isinstance(path, six.string_types): raise ValueError("`resource_name` must be a string type. " "Got `{}` instead".format(type(path))) From 0fb56e40fc15be8444c899c9038e9440a284c903 Mon Sep 17 00:00:00 2001 From: Vladimir Vlasov Date: Tue, 26 Feb 2019 17:00:00 +0100 Subject: [PATCH 05/11] bump version to 0.14.4 --- rasa_nlu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasa_nlu/version.py b/rasa_nlu/version.py index 69ccfb3d9388..aac4a8486fc1 100644 --- a/rasa_nlu/version.py +++ b/rasa_nlu/version.py @@ -3,4 +3,4 @@ from __future__ import division from __future__ import absolute_import -__version__ = '0.14.3' +__version__ = '0.14.4' From 756f60d03e995af6d17f1092f0cfc4195ed93d98 Mon Sep 17 00:00:00 2001 From: Tom Bocklisch Date: Tue, 19 Mar 2019 09:10:35 +0100 Subject: [PATCH 06/11] preparred next minor --- CHANGELOG.rst | 7 +++++++ rasa_nlu/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4760c5cd6212..cee5306cb3c5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,13 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning`_ starting with version 0.7.0. +[0.14.5] - 2018-03-19 +^^^^^^^^^^^^^^^^^^^^^ + +Fixed +----- +- properly tag ``stable`` docker image (instead of alpha) + [0.14.3] - 2018-02-01 ^^^^^^^^^^^^^^^^^^^^^ diff --git a/rasa_nlu/version.py b/rasa_nlu/version.py index aac4a8486fc1..43567baf5b48 100644 --- a/rasa_nlu/version.py +++ b/rasa_nlu/version.py @@ -3,4 +3,4 @@ from __future__ import division from __future__ import absolute_import -__version__ = '0.14.4' +__version__ = '0.14.5' From e9bf62e7db849d4f3394c46d6827d43bafb5da84 Mon Sep 17 00:00:00 2001 From: Ella Rohm-Ensing Date: Tue, 19 Mar 2019 13:20:37 +0100 Subject: [PATCH 07/11] fix tf requirement --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c7c8c48d369d..075402919757 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ ], 'tensorflow': ["sklearn-crfsuite~=0.3.6", "scipy~=1.1", - "tensorflow~=1.12", + "tensorflow~=1.12.0", "keras-applications==1.0.6", "keras-preprocessing==1.0.5" ], From a21372670e380bbeca7d0a05855b584d25a18077 Mon Sep 17 00:00:00 2001 From: Tom Bocklisch Date: Wed, 20 Mar 2019 10:30:36 +0100 Subject: [PATCH 08/11] Update CHANGELOG.rst --- CHANGELOG.rst | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cee5306cb3c5..805287da2e38 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,14 +4,21 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning`_ starting with version 0.7.0. -[0.14.5] - 2018-03-19 +[0.14.6] - 2019-03-20 +^^^^^^^^^^^^^^^^^^^^^ + +Fixed +----- +- fixed Changelog dates (dates had the wrong year attached) + +[0.14.5] - 2019-03-19 ^^^^^^^^^^^^^^^^^^^^^ Fixed ----- - properly tag ``stable`` docker image (instead of alpha) -[0.14.3] - 2018-02-01 +[0.14.3] - 2019-02-01 ^^^^^^^^^^^^^^^^^^^^^ Changed @@ -20,8 +27,8 @@ Changed and only on branches ending in ``.x`` (i.e. new version releases) - pinned ``coloredlogs``, ``future`` and ``packaging`` -[0.14.2] - 2018-01-29 -^^^^^^^^^^^^^^^^^^^^^ +[0.14.2] - 2019-01-29 +^^^^^^^^^^^^^^^^^^^^^ Added ----- @@ -33,7 +40,7 @@ Changed - updated requirements to match Core and SDK - pinned keras dependecies -[0.14.1] - 2018-01-23 +[0.14.1] - 2019-01-23 ^^^^^^^^^^^^^^^^^^^^^ Fixed @@ -42,7 +49,7 @@ Fixed .. _v0-14-0: -[0.14.0] - 2018-01-23 +[0.14.0] - 2019-01-23 ^^^^^^^^^^^^^^^^^^^^^ Added From 7c37edb351da5c1e5a74269aa13405caf0defde5 Mon Sep 17 00:00:00 2001 From: Tom Bocklisch Date: Wed, 20 Mar 2019 10:30:55 +0100 Subject: [PATCH 09/11] Update version.py --- rasa_nlu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasa_nlu/version.py b/rasa_nlu/version.py index 43567baf5b48..587dad8d879c 100644 --- a/rasa_nlu/version.py +++ b/rasa_nlu/version.py @@ -3,4 +3,4 @@ from __future__ import division from __future__ import absolute_import -__version__ = '0.14.5' +__version__ = '0.14.6' From 9a51bae4ab1dcf484e810aee61c05e2326339d5e Mon Sep 17 00:00:00 2001 From: Vladimir Vlasov Date: Tue, 16 Apr 2019 16:03:58 +0200 Subject: [PATCH 10/11] add `0.14.4` fixes --- CHANGELOG.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 805287da2e38..c9c0c0ea3e86 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,7 +17,14 @@ Fixed Fixed ----- - properly tag ``stable`` docker image (instead of alpha) - + +[0.14.4] - 2019-02-26 +^^^^^^^^^^^^^^^^^^^^^ + +Fixed +----- +- fixed training from url + [0.14.3] - 2019-02-01 ^^^^^^^^^^^^^^^^^^^^^ From 28173a5c73d9f78efb74021be513a980bed7ac36 Mon Sep 17 00:00:00 2001 From: akelad Date: Tue, 16 Apr 2019 17:18:19 +0200 Subject: [PATCH 11/11] remove underline from changelog --- CHANGELOG.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f853f7376bc6..941f9f326f80 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,8 +4,6 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning`_ starting with version 0.7.0. - -======= [Unreleased 0.15.0.aX] - `master`_ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^