From f6e1b2a431205647830777a8fdba8d5ba3e1db03 Mon Sep 17 00:00:00 2001 From: Marek Otahal Date: Tue, 9 Jul 2019 17:22:07 +0200 Subject: [PATCH 1/4] fix plotly dependency required for scripts/plot.py --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 87ed093f8..499804430 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ nupic==1.0.5 pandas==0.20.3 simplejson==3.11.1 boto3==1.7.11 +plotly==3.10.0 #required for scripts/plot From 9c4fdf9779966e235981e95fd2d6b40916bc1307 Mon Sep 17 00:00:00 2001 From: Marek Otahal Date: Tue, 9 Jul 2019 17:25:41 +0200 Subject: [PATCH 2/4] typos --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index eac3d56e9..61eafd5eb 100644 --- a/setup.py +++ b/setup.py @@ -28,8 +28,8 @@ # Utility function to read the README file. -# Used for the long_description. It"s nice, because now 1) we have a top level -# README file and 2) it"s easier to type in the README file than to put a raw +# Used for the long_description. It's nice, because now 1) we have a top level +# README file and 2) it's easier to type in the README file than to put a raw # string in below ... def read(fname): with open(os.path.join(os.path.dirname(__file__), fname)) as f: From f40f1a6a65fc2eae6b5ebe1342263328c3f4334f Mon Sep 17 00:00:00 2001 From: Marek Otahal Date: Tue, 9 Jul 2019 17:56:50 +0200 Subject: [PATCH 3/4] fixing dependency data not installed --- MANIFEST.in | 5 +++++ config/__init__.py | 0 data/__init__.py | 0 labels/__init__.py | 0 results/__init__.py | 0 setup.py | 1 + 6 files changed, 6 insertions(+) create mode 100644 MANIFEST.in create mode 100644 config/__init__.py create mode 100644 data/__init__.py create mode 100644 labels/__init__.py create mode 100644 results/__init__.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..a4dca629e --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +recursive-include config *.json +recursive-include data *.csv +recursive-include results *.csv +include labels *.json + diff --git a/config/__init__.py b/config/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/data/__init__.py b/data/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/labels/__init__.py b/labels/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/results/__init__.py b/results/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/setup.py b/setup.py index 61eafd5eb..2bb2a39a8 100644 --- a/setup.py +++ b/setup.py @@ -107,6 +107,7 @@ def findRequirements(): packages=find_packages(), long_description=read("README.md"), install_requires=requirements, + include_package_data=True, entry_points={ "console_scripts": [ "nab-plot = nab.plot:main", From 8c75fe7d1ef8318106c31fbdd21dddb858106716 Mon Sep 17 00:00:00 2001 From: Marek Otahal Date: Tue, 9 Jul 2019 18:26:29 +0200 Subject: [PATCH 4/4] update Readme for plot --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dfef4b996..7b4ef0512 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,8 @@ all individual detections for reported algorithms are checked in to the results subdirectory. Please see the README files in those locations. 1. If you want to plot some of the results, please see the README in the -`scripts` directory for `scripts/plot.py` +`scripts` directory for `scripts/plot.py`. For example `python scripts/plot.py` +will open default data-plots in the browser. 1. If you have your own algorithm and want to run the NAB benchmark, please see the [NAB Entry Points](https://github.com/numenta/NAB/wiki#nab-entry-diagram)