Added: warning, Python 3.6 support will be dropped in future versions

.github/workflows/ci.yml

@@ -147,12 +147,11 @@ jobs:
           esac
           pdm run test -e "${python_test_env}"
 
-      - name: Cache coverage
-        if: startsWith(matrix.python-version, '3.10')
+      - name: Cache coverage ${{ matrix.python-version }}
         uses: actions/cache@v3
         with:
-          path: ./.tox/py310/coverage
-          key: cache_coverage_${{ github.run_id }}
+          path: .coverage/env/.coverage.${{ matrix.python-version }}
+          key: cache_coverage_${{ matrix.python-version }}_${{ github.run_id }}
 
   test_ubuntu20:
     runs-on: ubuntu-20.04
@@ -187,3 +186,72 @@ jobs:
         run: |
           source .venv/bin/activate
           tox -e py36 --installpkg dist/*.whl
+
+      - name: Cache coverage ${{ matrix.python-version }}
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.${{ matrix.python-version }}
+          key: cache_coverage_${{ matrix.python-version }}_${{ github.run_id }}
+
+  test_coverage:
+    runs-on: ubuntu-22.04
+    needs: [test_ubuntu20, test_ubuntu22]
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - name: Cache dev-py environment
+        uses: actions/cache@v3
+        with:
+          path: .venv
+          key: cache_dev_py_ubuntu22_${{ hashFiles('pdm.lock') }}
+
+      - name: Cache coverage 3.6
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.3.6
+          key: cache_coverage_3.6_${{ github.run_id }}
+
+      - name: Cache coverage 3.7
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.3.7
+          key: cache_coverage_3.7_${{ github.run_id }}
+
+      - name: Cache coverage 3.8
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.3.8
+          key: cache_coverage_3.8_${{ github.run_id }}
+
+      - name: Cache coverage 3.9
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.3.9
+          key: cache_coverage_3.9_${{ github.run_id }}
+
+      - name: Cache coverage 3.10
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.3.10
+          key: cache_coverage_3.10_${{ github.run_id }}
+
+      - name: Cache coverage 3.11
+        uses: actions/cache@v3
+        with:
+          path: .coverage/env/.coverage.3.11
+          key: cache_coverage_3.11_${{ github.run_id }}
+
+      - name: Report coverage
+        run: |
+          source .venv/bin/activate
+          tox -e coverage
+
+      - name: Cache coverage
+        uses: actions/cache@v3
+        with:
+          path: .coverage/html
+          key: cache_coverage_${{ github.run_id }}

.github/workflows/doc.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Cache coverage
         uses: actions/cache@v3
         with:
-          path: ./.tox/py310/coverage
+          path: .coverage/html
           key: cache_coverage_${{ github.run_id }}
 
       - name: Install package
@@ -113,7 +113,7 @@ jobs:
       - name: Cache coverage
         uses: actions/cache@v3
         with:
-          path: ./.tox/py310/coverage
+          path: .coverage/html
           key: cache_coverage_${{ github.run_id }}
 
       - name: Install package

.gitignore

@@ -12,6 +12,7 @@ vizzu-lib
 .venv
 .pdm-python
 .tox
+.coverage
 
 site
 .chromium

pyproject.toml

@@ -138,43 +138,38 @@ pkg_release = {composite = ["pkg_build", "pkg_check", "python ./tools/ci/version
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py{36,37,38,39,310,311}
-
-[testenv]
-deps =
+envlist =
+    py{36,37,38,39,310,311}
     coverage
-    openpyxl    
 
-[testenv:py{36}]
+[testenv]
 setenv =
-    COVERAGE_FILE = .tox/py36/.coverage
+    COVERAGE_FILE = .coverage/env/.coverage.{envname}
+deps =
+    coverage[toml]
 extras =
     pandas
     numpy
 commands =
     python -m coverage run --branch --source ipyvizzu -m unittest discover tests
-    python -m coverage report -m --fail-under=100 --omit .tox/py36/lib/python3.6/site-packages/ipyvizzu/integrations/fugue.py
+    python -m coverage report -m
+    python -c "import os; pyenv='{envname}'; os.rename('.coverage/env/.coverage.' + pyenv, '.coverage/env/.coverage.3.' + pyenv[3:])"
 
-[testenv:py{37,38,39,311}]
+[testenv:py{37,38,39,310,311}]
 package = editable
+deps =
+    {[testenv]deps}
+    openpyxl
 extras =
-    pandas
-    numpy
+    {[testenv]extras}
     fugue
-commands =
-    python -m coverage run --data-file .tox/{envname}/.coverage --branch --source ipyvizzu -m unittest discover tests
-    python -m coverage report --data-file .tox/{envname}/.coverage -m --fail-under=100
 
-[testenv:py{310}]
-package = editable
-extras =
-    pandas
-    numpy
-    fugue
+[testenv:coverage]
+skip_install = True
 commands =
-    python -m coverage run --data-file .tox/{envname}/.coverage --branch --source ipyvizzu -m unittest discover tests
-    python -m coverage html --data-file .tox/{envname}/.coverage -d .tox/{envname}/coverage
-    python -m coverage report --data-file .tox/{envname}/.coverage -m --fail-under=100
+    python -m coverage combine --keep --data-file .coverage/.coverage .coverage/env/
+    python -m coverage html --data-file .coverage/.coverage -d .coverage/html
+    python -m coverage report --data-file .coverage/.coverage -m --fail-under=100
 """
 
 [tool.pdm.dev-dependencies]
@@ -244,3 +239,6 @@ path = "src/ipyvizzu/__version__.py"
 [tool.pylint.messages-control]
 disable = ["fixme"]
 good-names= ["i", "df"]
+
+[tool.coverage.paths]
+source = ["src/", ".tox/py*/lib/python*/site-packages/"]

src/ipyvizzu/__init__.py

@@ -46,6 +46,9 @@
 * [DisplayTemplate][ipyvizzu.template.DisplayTemplate]
 """
 
+import sys
+import warnings
+
 from .chart import Chart
 from .animation import (
     AbstractAnimation,
@@ -98,3 +101,14 @@
     "DisplayTarget",
     "DisplayTemplate",
 ]
+
+
+if sys.version_info >= (3, 7):
+    pass
+else:
+    # TODO: remove once support for Python 3.6 is dropped
+    warnings.warn(
+        "Python 3.6 support will be dropped in future versions.",
+        FutureWarning,
+        stacklevel=2,
+    )

tools/docs/mkdocs.yml

@@ -107,7 +107,7 @@ plugins:
         - style/gen_style_reference.py
   - coverage:
       page_name: coverage
-      html_report_dir: .tox/py310/coverage
+      html_report_dir: .coverage/html
   - literate-nav:
       implicit_index: true