Skip to content

Commit

Permalink
Merge branch 'master' into add-py312-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
lgautier committed Mar 23, 2024
2 parents 2efcfed + ae74c26 commit b5cb0cc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@ jobs:
matrix:
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
r-version: [release]
os: [ubuntu-latest, macOS-latest]
os: [ubuntu-latest, macOS-latest, macos-14]
exclude:
- os: macos-14
python-version: 3.8
- os: macos-14
python-version: 3.9
- os: macos-14
python-version: "3.10"
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -79,6 +86,7 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
max-parallel: 4
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
r-version: ['release']
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ Bugs fixed
clearly errors due unspecified package name or missing class
definition in within the package namespace specified.

- The display of SVG figures in jupyter notebooks is fixed.
there was a typo in the code.


Release 3.5.15
==============
Expand Down
2 changes: 1 addition & 1 deletion rpy2/ipython/rmagic.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def display_figures_svg(graph_dir, isolate_svgs=True):
# Cairo creates an SVG file every time R is called
# -- empty ones are not published
if os.stat(imgfile).st_size >= 1000:
img = IPython.display.SVG(filename=imgfile),
img = IPython.display.SVG(filename=imgfile)
IPython.display.display_svg(
img,
metadata={'image/svg+xml': dict(isolated=True)} if isolate_svgs else {}
Expand Down

0 comments on commit b5cb0cc

Please sign in to comment.