0.1.31 (#22)

* chore: fix ruff errors

* chore: add ruff cache to .gitignore

* refactor: deprecate copy to clipboard

* feat: pass additional **kwargs to requests.post

* chore: format with black

* chore: update github action

* feat: bump version

Author: dschenck

.github/workflows/testing.yml

@@ -1,34 +1,30 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
 
-name: testing
+name: Linting and testing
 
 on:
   push:
     branches: ["*"]
   pull_request:
     branches: ["latest"]
+  workflow_dispatch:
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python 3
         uses: actions/setup-python@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.x"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install flake8 pytest coverage
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-      - name: blacken
+      - name: Check format is Black
         uses: psf/black@stable
         with:
           src: "./easychart"
@@ -38,6 +34,24 @@ jobs:
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install flake8 pytest coverage
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
       - name: Test with pytest
         run: |
           coverage run -m pytest tests/*

.gitignore

@@ -130,4 +130,8 @@ dmypy.json
 #Mac files
 .DS_Store
 
-notes.txt
+notes.txt
+
+# Ruff
+.ruff_cache
+.ruff_cache/*

easychart/__init__.py

@@ -12,7 +12,7 @@
 import easychart.extensions as ext
 import easychart.rendering
 
-__version__ = "0.1.30"
+__version__ = "0.1.31"
 
 
 def new(

easychart/ipynb.py

@@ -1,6 +1,6 @@
 try:
     ip = get_ipython()  # noqa: F821
-except:
+except Exception:
     ip = None
 
 if ip and (

easychart/models/chart.py

@@ -1135,7 +1135,7 @@ def draw(
                         "point": point
                         or (
                             None
-                            if (x == y == None)
+                            if (x is y is None)
                             else {"x": x, "y": y, "xAxis": xAxis, "yAxis": yAxis}
                         ),
                         "x": xOffset,
@@ -1238,6 +1238,9 @@ def export(self, filename, *, theme=None, scale=2, throttle=None, **kwargs):
             as to respect the rate limit of the export server
 
             defaults to easychart.config.exporting['rate-limit'] or 10 seconds
+
+        **kwargs : dict (optional)
+            Additional arguments to pass to the HTTP request
         """
         if filename[-3:] not in ["png", "jpg", "jpeg", "svg", "pdf"]:
             raise ValueError(
@@ -1257,12 +1260,13 @@ def export(self, filename, *, theme=None, scale=2, throttle=None, **kwargs):
                     "scale": scale,
                     "globalOptions": easychart.themes.get(theme),
                 },
+                **kwargs,
             )
 
             if res.status_code == 429:
                 raise Exception(
                     textwrap.dedent(
-                        f"""
+                        """
                         The export server responded with HTTP code 429, which means you are making too many export requests in too short a period of time. 
 
                         Please increase the throttle value, or manually set a time.sleep between each export request.

easychart/models/series.py

@@ -91,9 +91,9 @@ def append(self, data=None, **kwargs):
                 if isinstance(kwargs["index"], collections.abc.Iterable):
                     data = data.values.tolist()
                 elif isinstance(kwargs["index"], bool):
-                    if kwargs["index"] == False:
+                    if kwargs["index"] is False:
                         data = data.values.tolist()
-                    if kwargs["index"] == True:
+                    if kwargs["index"] is True:
                         data = data.reset_index().values.tolist()
             else:
                 data = data.reset_index().values.tolist()

easychart/rendering.py

@@ -1,4 +1,3 @@
-import IPython
 import os
 import simplejson
 import html
@@ -42,8 +41,7 @@ def render(charts) -> str:
     return f"""
         <iframe 
             style="border:0;outline:none;width:{easychart.internals.Size(grid.width or easychart.config.rendering.container.width)};max-width:{easychart.internals.Size(easychart.config.rendering.container.get("max-width", "100%"))}" 
-            onload='javascript:(function(o){{o.style.height=Math.max(400, o.contentWindow.document.body.scrollHeight)+"px"; o.contentWindow.focus()}}(this));' 
-            allow="clipboard-read; clipboard-write"
+            onload='javascript:(function(o){{o.style.height=Math.max(400, o.contentWindow.document.body.scrollHeight)+"px"}}(this));'
             srcdoc="{html.escape(template)}">
         </iframe>
     """

easychart/template.jinja

@@ -83,57 +83,8 @@
                         else {
                             var chart = Highcharts.chart(
                                 `container[${i}]`, 
-                                {
-                                    ...plot.chart, 
-                                    exporting:{
-                                        ...plot.chart.exporting, 
-                                        "menuItemDefinitions": {
-                                            "copy": {
-                                                onclick: function () {
-                                                    return callback()
-                                                },
-                                                text: 'Copy as PNG'
-                                            }
-                                        },
-                                        "buttons": {
-                                            "contextButton": {
-                                                "menuItems": ["copy", "separator", "viewFullscreen", "printChart", "separator", "downloadPNG", "downloadJPEG", "downloadPDF", "downloadSVG",]
-                                            }
-                                        }
-                                    }
-                                }
+                                plot.chart
                             );
-
-                            var callback = function (chart, options) {
-                                // copy chart to clipboard as PNG
-                                var callback = function () {
-                                    var canvas = document.createElement('canvas');
-                                    canvas.height = chart.chartHeight * options.scale;
-                                    canvas.width = chart.chartWidth * options.scale;
-
-                                    var image = new Image(
-                                        canvas.width,
-                                        canvas.height
-                                    );
-
-                                    image.onload = function () {
-                                        canvas.getContext("2d").drawImage(image, 0, 0, image.width, image.height);
-
-                                        canvas.toBlob(blob => {
-                                            return navigator.clipboard.write([
-                                                new ClipboardItem({
-                                                    'image/png': blob
-                                                })
-                                            ]).catch(e => {
-                                                console.log("Error", e)
-                                            });
-                                        }, "image/png")
-                                    };
-
-                                    image.src = 'data:image/svg+xml,' + encodeURIComponent(chart.getSVG());
-                                }
-                                return callback
-                            }(chart, { scale: 2 })
                         }
                     }
                     catch(error){

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="easychart",
-    version="0.1.30",
+    version="0.1.31",
     author="david.schenck@outlook.com",
     author_email="david.schenck@outlook.com",
     description="Highcharts meets python in your Jupyter notebook",