Merge branch 'main' into testing

Author: Carreau

.github/dependabot.yml

@@ -1,11 +1,17 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
 version: 2
 updates:
-  - package-ecosystem: "pip" # See documentation for possible values
+  - package-ecosystem: "pip"
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      actions:
+        patterns:
+          - "*"

.github/workflows/main.yml

@@ -11,37 +11,39 @@ on:
 defaults:
   run:
     shell: bash -l {0}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   run:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 3
 
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.13t", "3.14-dev"]
-
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v5
 
-    - name: Setup conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Setup Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-        mamba-version: "*"
-        auto-activate-base: false
-        channels: conda-forge
 
-    - name: Install dependencies
-      run: mamba install ipython matplotlib flake8
+    - name: Install package with test dependencies
+      run: pip install .[test]
 
-    - name: Install package
-      run: pip install .
+    - name: Test installation with nbdime
+      if: ${{ matrix.python-version != "3.9" }}
+      run: pytest -v --nbdime
 
-    - name: Test installation
-      run: python -c 'from matplotlib_inline.backend_inline import show'
+    - name: Test installation without nbdime
+      if: ${{ matrix.python-version == "3.9" }}
+      run: pytest -v
 
     - name: Test flake8
       run: flake8 matplotlib_inline --ignore=E501,W504,W503

.github/workflows/publish.yml

@@ -0,0 +1,48 @@
+name: "Publish Wheel"
+on:
+  push:
+    tags:
+      - '*'
+permissions:
+  contents: read
+
+jobs:
+  pypi-publish:
+    name: Upload release to PyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/matplotlib-inline
+    permissions:
+      id-token: write
+    steps:
+    - uses: actions/checkout@v5
+    
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+    - name: Install built wheel
+      run: pip install dist/*
+    - name: Build package
+      run: python -m build
+    - name: Echo current tag
+      run: echo ${{ github.ref }}
+    - name: Get package version
+      run: |
+        PACKAGE_VERSION=$(python -c 'import matplotlib_inline; print(matplotlib_inline.__version__)')
+        echo "Package version: $PACKAGE_VERSION"
+
+    - name: Check tag and package version match
+      run: |
+        if [ "$GITHUB_REF" != "refs/tags/$PACKAGE_VERSION" ]; then
+          echo "Tag and package version do not match. Aborting."
+          exit 1
+        fi
+    # - name: Publish package
+    #   uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc
+

.gitignore

@@ -2,3 +2,4 @@
 dist
 build
 __pycache__
+.ipynb_checkpoints

matplotlib_inline/__init__.py

@@ -1,2 +1,8 @@
 from . import backend_inline, config  # noqa
-__version__ = "0.1.7"  # noqa
+
+__version__ = "0.1.7"
+
+# we can't ''.join(...) otherwise finding the version number at build time requires
+# import which introduces IPython and matplotlib at build time, and thus circular
+# dependencies.
+version_info = tuple(int(s) for s in __version__.split(".")[:3])

matplotlib_inline/backend_inline.py

@@ -208,9 +208,14 @@ def configure_inline_support(shell, backend):
 
 def _enable_matplotlib_integration():
     """Enable extra IPython matplotlib integration when we are loaded as the matplotlib backend."""
-    from matplotlib import get_backend
     ip = get_ipython()
-    backend = get_backend()
+
+    import matplotlib
+    if matplotlib.__version_info__ >= (3, 10):
+        backend = matplotlib.get_backend(auto_select=False)
+    else:
+        backend = matplotlib.rcParams._get("backend")
+
     if ip and backend in ('inline', 'module://matplotlib_inline.backend_inline'):
         from IPython.core.pylabtools import activate_matplotlib
         try:

pyproject.toml

@@ -11,20 +11,20 @@ authors = [
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Framework :: IPython",
-    "Framework :: Jupyter",
-    "Framework :: Jupyter :: JupyterLab",
     "Framework :: Jupyter :: JupyterLab :: 3",
     "Framework :: Jupyter :: JupyterLab :: 4",
+    "Framework :: Jupyter :: JupyterLab",
+    "Framework :: Jupyter",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: BSD License",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
+    "License-Expression: BSD-3-Clause",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python",
     "Topic :: Multimedia :: Graphics",
 ]
 dependencies = ["traitlets"]
@@ -37,13 +37,38 @@ keywords = [
 ]
 license = {file = "LICENSE"}
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [project.entry-points."matplotlib.backend"]
 inline = "matplotlib_inline.backend_inline"
 
+[project.optional-dependencies]
+test = [
+    "flake8",
+    "matplotlib",
+    "nbdime",
+    "nbval",
+    "notebook",
+    "pytest",
+]
+
 [project.urls]
 Homepage = "https://github.com/ipython/matplotlib-inline"
 
 [tool.setuptools.dynamic]
 version = {attr = "matplotlib_inline.__version__"}
+
+[tool.pytest.ini_options]
+xfail_strict = true
+log_cli_level = "info"
+addopts = [
+    "--nbval",
+    "--ignore=tests/notebooks/.ipynb_checkpoints/*",
+    "--strict-config",
+    "-ra",
+    "--strict-markers",
+]
+filterwarnings = ["error"]
+testpaths = [
+    "tests",
+]

tests/notebooks/mpl_inline.ipynb

@@ -0,0 +1,3 @@
+def test_import():
+    from matplotlib_inline.backend_inline import show
+    show()