From 7d99a73f565d4cf49ef4ef288cf1bafb9ded3ab7 Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 09:55:16 +0100 Subject: [PATCH 1/8] Fixes #5 - correct usage typo --- js/jbrowse_rasterize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jbrowse_rasterize.js b/js/jbrowse_rasterize.js index d9d21dc..632efb2 100755 --- a/js/jbrowse_rasterize.js +++ b/js/jbrowse_rasterize.js @@ -16,7 +16,7 @@ if(casper.cli.has("v")) { var usage = "\nUSAGE: jbrowse_rasterize.js --width= --imgType= --baseUrl= --locs= --outdir= [--passwdFile=] [--navOff]\n" +"\tNOTE: if '--imgType=pdf' please set '--height=\n" - +"\tVERSION: use '--v' to ger version of script, (--version gives the casperjs version)\n"; + +"\tVERSION: use '--v' to get version of script, (--version gives the casperjs version)\n"; if (Object.keys(casper.cli.options).length < 7) { console.log(usage); From ebd564cbca2af38ef98aa6ab927ae16f6c0e0ced Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:08:20 +0100 Subject: [PATCH 2/8] Update known issues --- docs/source/jbrowse_rasterize.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/source/jbrowse_rasterize.rst b/docs/source/jbrowse_rasterize.rst index 75aa1e9..a9701c1 100644 --- a/docs/source/jbrowse_rasterize.rst +++ b/docs/source/jbrowse_rasterize.rst @@ -84,8 +84,6 @@ Functionality of the following tracks has been tested: Known issues ------------ -At present doesn't process the `multibigwig `_ plugin track correctly. -The ``loading`` divs clear when the canvas is added but even with extended timeout (far more than time taken in browser) -I can't get the multiple layers of the canvas to render, only the scale. +* `multibigwig `_ - plugin track will only render with v0.7.0+ Please report any problems with other track types on the `GitHub issue tracker `_ From 5b1f531eb9838dd30fe5c94b457ed4d2854020f2 Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:16:58 +0100 Subject: [PATCH 3/8] Resolves #4 - add sphinx build to travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 86a3318..a3c9d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ node_js: install: - npm install -g eslint + - pip install sphinx sphinx-autobuild script: - eslint js + - cd docs && make html From 8aa64a09de82725dd026493f5314d5c502186d4c Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:19:10 +0100 Subject: [PATCH 4/8] Looks like sphinx already in image --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3c9d57..b9fe1a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ node_js: install: - npm install -g eslint - - pip install sphinx sphinx-autobuild script: - eslint js From afdc80b5cdd5802cb93c4b8c5640e65104c79e2b Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:22:13 +0100 Subject: [PATCH 5/8] pip3 not pip --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b9fe1a6..5f448ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ node_js: install: - npm install -g eslint + - pip3 install sphinx sphinx-autobuild script: - eslint js From 028492823c981503d903359fe44387a918d51de0 Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:26:07 +0100 Subject: [PATCH 6/8] trying to fix pip --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f448ba..92f7b1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ node_js: install: - npm install -g eslint - - pip3 install sphinx sphinx-autobuild + - pip install --user sphinx sphinx-autobuild script: - eslint js From be5eda9b760e99165b9854fe9c566cbeafc7b207 Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:31:58 +0100 Subject: [PATCH 7/8] Add rtd theme --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 92f7b1b..c9bd1ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ node_js: install: - npm install -g eslint - - pip install --user sphinx sphinx-autobuild + - pip install --user sphinx sphinx-autobuild sphinx_rtd_theme script: - eslint js From 967dc6bf2de02e4ad0e8644c19732e8238ca220e Mon Sep 17 00:00:00 2001 From: Keiran Raine Date: Tue, 9 May 2017 10:44:40 +0100 Subject: [PATCH 8/8] Correct changes log and bump version of script --- CHANGES.md | 12 ++++++++++++ js/jbrowse_rasterize.js | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 87a98f9..a10c58e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,15 @@ +1.1.1 +===== +* Update RTD entry to indicate multibigwig has been fixed. +* Add sphinx rtd build to travis-ci. +* Correct typo in usage. + +1.1.0 +===== +* Makes jbrowse_rasterize.js executable +* Corrections to build badges +* Cleaned up RTD pages + 1.0.0 ===== * Monitors the track divs to confirm track loading/rendering is complete. diff --git a/js/jbrowse_rasterize.js b/js/jbrowse_rasterize.js index 632efb2..1360a54 100755 --- a/js/jbrowse_rasterize.js +++ b/js/jbrowse_rasterize.js @@ -1,5 +1,5 @@ #!/usr/bin/env casperjs -var VERSION="1.1.0" +var VERSION="1.1.1" var casper = require('casper').create({ verbose: true,