Merge de007b3 into 91be580

stephane-caron · Nov 1, 2023 · 920bd20 · 920bd20
2 parents 91be580 + de007b3
commit 920bd20
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -69,7 +69,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest, macos-latest, windows-latest]
-                python-version: ["3.7", "3.8", "3.9", "3.10"]
+                python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
         steps:
             - name: "Checkout sources"
@@ -91,3 +91,10 @@ jobs:
                   tox
               env:
                   PLATFORM: ${{ matrix.os }}
+
+    ci_success:
+        name: "CI success"
+        runs-on: ubuntu-latest
+        needs: [coverage, lint, test]
+        steps:
+            - run: echo "CI workflow completed successfully"
diff --git a/foxplot/cli.py b/foxplot/cli.py
@@ -108,7 +108,9 @@ def main() -> None:
         left_series: List[Union[Series, Node]] = [
             fox.get_series(label) for label in left_labels
         ]
-        right_series = [fox.get_series(label) for label in right_labels]
+        right_series: List[Union[Series, Node]] = [
+            fox.get_series(label) for label in right_labels
+        ]
         fox.plot(
             left_series,
             right_series,

diff --git a/foxplot/generate_html.py b/foxplot/generate_html.py
@@ -67,9 +67,12 @@ def generate_html(
     Returns:
         HTML contents of the page.
     """
-    uplot_min_css = resources.path("foxplot.uplot", "uPlot.min.css")
-    uplot_iife_js = resources.path("foxplot.uplot", "uPlot.iife.js")
-    uplot_mwheel_js = resources.path("foxplot.uplot", "uPlot.mousewheel.js")
+    with resources.path("foxplot.uplot", "uPlot.min.css") as path:
+        uplot_min_css = path
+    with resources.path("foxplot.uplot", "uPlot.iife.js") as path:
+        uplot_iife_js = path
+    with resources.path("foxplot.uplot", "uPlot.mousewheel.js") as path:
+        uplot_mwheel_js = path
 
     color_picker = ColorPicker()
     left_axis_label = f" {left_axis_unit}" if left_axis_unit else ""

diff --git a/foxplot/series.py b/foxplot/series.py
@@ -42,7 +42,7 @@ def __repr__(self):
         values = list(self.__data.values())
         return f"Time series with values: {values}"
 
-    def _get(self, max_index: int) -> List[float]:
+    def _get(self, max_index: int) -> List:
         """Get indexed series as a list of values.
 
         Args:

diff --git a/tox.ini b/tox.ini
@@ -3,14 +3,15 @@ isolated_build = True
 envlist =
     coverage
     lint
-    py{37,38,39,310}-{linux,macos,windows}
+    py{37,38,39,310,311}-{linux,macos,windows}
 
 [gh-actions]
 python =
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [testenv]
 deps =