Merge pull request #103 from rspencer01/walk_dependencies

Unpin packages

Author: rspencer01

.circleci/config.yml

@@ -23,7 +23,7 @@ defaults: &defaults
     - run: sudo apt-get install poppler-utils
     - run: sudo apt-get install pandoc
     - run: npm install
-    - run: npm install highcharts@5.0.11 highcharts-heatmap highcharts-export-csv highcharts-exporting highcharts-funnel
+    - run: npm install highcharts@10.0.0
     # Phantomjs is required to Bokeh static output
     - run: npm install phantomjs-prebuilt
     - run:
@@ -33,14 +33,14 @@ defaults: &defaults
          . ci/bin/activate
          pip install jsmin
          pip install six
-         pip install "numpy<2"
-         pip install "bokeh<=2.4"
+         pip install numpy
+         pip install bokeh
          pip install plotly
          pip install lxml
          pip install coveralls
          pip install -r docs/source/requirements.txt
-         python setup.py install  --highcharts=node_modules/highcharts/,node_modules/highcharts-heatmap/,node_modules/highcharts-funnel,node_modules/highcharts-exporting,node_modules/highcharts-export-csv --wkhtmltopdf=wkhtmltox/bin
-         python setup.py load_highcharts  --highcharts=node_modules/highcharts/,node_modules/highcharts-heatmap/,node_modules/highcharts-funnel,node_modules/highcharts-exporting,node_modules/highcharts-export-csv
+         python setup.py install  --highcharts=node_modules/highcharts/,node_modules/highcharts/modules/ --wkhtmltopdf=wkhtmltox/bin
+         python setup.py load_highcharts  --highcharts=node_modules/highcharts/,node_modules/highcharts/modules
     # Save dependency cache
     - save_cache:
         key: v1-dep-{{ .Branch }}-{{ epoch }}
@@ -55,7 +55,7 @@ defaults: &defaults
          . ci/bin/activate
          mkdir -p /tmp/circleci-test-results
          python setup.py test --pytest-args="--junitxml=/tmp/circleci-test-results/junit.xml"
-         python setup.py build_sphinx
+         sphinx-build docs/source build/sphinx/html
     - run: 
        name: Get code coverage
        command: |

README.md

@@ -41,7 +41,7 @@ pip install --install-option="INSTALL OPTIONS" git+https://github.com/manahl/pyb
 e.g.
 
 ```
-pip install --install-option="--highcharts=~/node_modules/highcharts/,~/node_modules/highcharts-heatmap/" git+https://github.com/manahl/pybloqs.git
+pip install --install-option="--highcharts=~/node_modules/highcharts/,~/node_modules/highcharts/modules/" git+https://github.com/manahl/pybloqs.git
 ```
 
 
@@ -83,21 +83,17 @@ pip install pybloqs[plotly]
 - HighCharts (optional; proprietary license, see https://shop.highsoft.com/highcharts-t2):
 
 Highcharts is not bundled with PyBloqs. To create blocks with Highcharts plots, you need to download Highcharts 
-separately (e.g. with `npm install highcharts`, `npm install highcharts-heatmap` etc.), and provide the path to your 
-highcharts installation. Please make sure you have the right license for Highcharts. For full functionality you will 
-need the following highcharts packages: highcharts, highcharts-heatmap, highcharts-funnel, highcharts-exporting, 
-highcharts-export-csv (this example assumes, npm installed files into directory ~/node_modules).
+separately (e.g. with `npm install highcharts`), and provide the path to your 
+highcharts installation. PyBloqs currently only support `highcharts^10.0.0`.
+Please make sure you have the right license for Highcharts. This example assumes, npm installed files into directory ~/node_modules).
 
 ```
---highcharts=~/node_modules/highcharts/,
-~/node_modules/highcharts-heatmap/,~/node_modules/highcharts-funnel,~/node_modules/highcharts-exporting,
-~/node_modules/highcharts-export-csv
+--highcharts=~/node_modules/highcharts/,~/node_modules/highcharts/modules
 ```
 
 When installing in development mode you can load highcharts explicitly (this example assumes, npm installed files into directory ~/node_modules)
 ```
-python setup.py load_highcharts --highcharts=~/node_modules/highcharts/,~/node_modules/highcharts-heatmap/,\
-~/node_modules/highcharts-funnel,~/node_modules/highcharts-exporting,~/node_modules/highcharts-export-csv
+python setup.py load_highcharts --highcharts=~/node_modules/highcharts/,~/node_modules/highcharts/modules/
 ```
 
 ### Using PyBloqs

docs/source/requirements.txt

@@ -1,5 +1,5 @@
 nbconvert
-sphinx<=5.0
+sphinx
 nbsphinx
 matplotlib
 ipython[notebook]

pybloqs/block/image.py

@@ -23,10 +23,19 @@
 
 try:
     try:
-        from bokeh.resources import CSSResources, JSResources
+        # Bokeh >= 3.1
+        from bokeh.resources import Resources
+        JSResources = Resources
+        CSSResources = Resources
     except ImportError:
-        from bokeh.templates import CSSResources, JSResources
-    from bokeh.plotting.figure import Figure as BokehFigure
+        try:
+            from bokeh.resources import CSSResources, JSResources
+        except ImportError:
+            from bokeh.templates import CSSResources, JSResources
+    try:
+        from bokeh.plotting.figure import Figure as BokehFigure
+    except ImportError:
+        from bokeh.plotting import figure as BokehFigure
     from bokeh.embed.standalone import components
     from bokeh.io import export_png
     _BOKEH_AVAILABLE = True

pybloqs/plot/core.py

@@ -22,7 +22,7 @@
 _range_plots = {"arearange", "areasplinerange", "candlestick", "columnrange", "ohlc"}
 
 HIGHCHARTS_MAIN = "highstock"
-HIGHCHARTS_MODULES = ["highcharts-more", "highcharts-3d", "heatmap", "funnel", "exporting", "export-csv"]
+HIGHCHARTS_MODULES = ["highcharts-more", "highcharts-3d", "heatmap", "funnel", "exporting", "export-data"]
 HIGHCHARTS_PYBLOQS = "highcharts-pybloqs"
 # Ordering has to be: main, modules, pybloqs-specific
 HIGHCHARTS_ALL = [HIGHCHARTS_MAIN] + HIGHCHARTS_MODULES + [HIGHCHARTS_PYBLOQS] 

setup.py

@@ -223,7 +223,7 @@ def run_tests(self):
     ],
     extras_require={
         "docs_and_notebook": [
-            "sphinx<=5.0",
+            "sphinx",
             "nbsphinx",
             "ipython[notebook]",
             "sphinxcontrib-apidoc",

tests/integration/generate/test_image.py

@@ -4,7 +4,7 @@
 from bokeh.models import ColumnDataSource, FactorRange
 from bokeh.plotting import figure
 
-from pybloqs.block.image import PlotBlock, ImgBlock, PlotlyPlotBlock, BokehPlotBlock
+from pybloqs.block.image import PlotBlock, ImgBlock, PlotlyPlotBlock, BokehPlotBlock, _BOKEH_AVAILABLE
 from .generation_framework import assert_report_generated
 import plotly.graph_objs as go
 
@@ -51,6 +51,8 @@ def test_plotlyplot():
 
     return PlotlyPlotBlock(fig)
 
+def test_bokeh_available():
+    assert _BOKEH_AVAILABLE
 
 @assert_report_generated
 def test_bokehplot():