Merge branch 'hotfix/1.1.1'

.travis.yml

@@ -11,6 +11,8 @@ node_js:
 
 install:
   - npm install -g eslint
+  - pip install --user sphinx sphinx-autobuild sphinx_rtd_theme
 
 script:
   - eslint js
+  - cd docs && make html

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.

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 <https://github.com/elsiklab/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 <https://github.com/elsiklab/multibigwig>`_ - plugin track will only render with v0.7.0+
 
 Please report any problems with other track types on the `GitHub issue tracker <https://github.com/cancerit/cgpJBrowseToolkit/issues>`_

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,
@@ -16,7 +16,7 @@ if(casper.cli.has("v")) {
 
 var usage = "\nUSAGE: jbrowse_rasterize.js --width=<int> --imgType=<bmp|jpeg|pdf|png> --baseUrl=<url> --locs=<locations.bed> --outdir=<outdir> [--passwdFile=<file>] [--navOff]\n"
             +"\tNOTE: if '--imgType=pdf' please set '--height=<required 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);