Skip to content

Commit 5d3c188

Browse files
Merge pull request #78 from easyscience/develop
New release
2 parents 32c0ea6 + 46ea142 commit 5d3c188

File tree

4 files changed

+15
-27
lines changed

4 files changed

+15
-27
lines changed

docs/mkdocs.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ extra:
2727
name: EasyDiffraction Library Source Code on GitHub
2828

2929
# Jupyter notebooks
30-
plugins:
31-
- mkdocs-jupyter:
32-
execute_ignore:
33-
- 'quick*.ipynb'
34-
- 'basic*.ipynb'
35-
- 'advanced*.ipynb'
36-
- 'cryst*.ipynb'
37-
- 'pdf*.ipynb'
38-
# - '*emcee*.ipynb' # Ignore notebooks with 'emcee' in the name from execution
30+
#plugins:
31+
# - mkdocs-jupyter:
32+
# execute_ignore:
33+
# - 'quick*.ipynb'
34+
# - 'basic*.ipynb'
35+
# - 'advanced*.ipynb'
36+
# - 'cryst*.ipynb'
37+
# - 'pdf*.ipynb'
3938

4039
##################
4140
# Add new settings

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ docs = [
6565
'pyyaml', # YAML parser
6666
]
6767
visualization = [
68-
'darkdetect', # Detecting dark mode
69-
'pandas', # Displaying tables in juptyer notebooks
70-
'plotly<6.1.0', # Interactive plots. 0.6.0 => Empty charts in Jupyter notebooks ...
71-
'py3Dmol', # Visualisation of crystal structures
68+
'darkdetect', # Detecting dark mode
69+
'pandas', # Displaying tables in juptyer notebooks
70+
'plotly', # Interactive plots
71+
'py3Dmol', # Visualisation of crystal structures
7272
]
7373

7474
[project.urls]
@@ -115,7 +115,7 @@ source = 'versioningit' # Use versioningit to manage the version
115115
[tool.versioningit.format]
116116
distance = '{base_version}+d{distance}' # example: 0.5.8+d3, 1.2.3.post4+d2
117117
dirty = '{base_version}' # example: 0.5.8, 1.2.3.post4
118-
distance-dirty = '{base_version}+d{distance}' #
118+
distance-dirty = '{base_version}+d{distance}' # see 1st example
119119

120120
# Configure how versioningit detects versions from Git
121121
# - 'match' ensures it only considers tags starting with 'v'

src/easydiffraction/plotting/plotters/plotter_plotly.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
display = None
1313
HTML = None
1414

15-
from easydiffraction.utils.utils import is_github_ci
15+
from easydiffraction.utils.utils import is_pycharm
1616

1717
from .plotter_base import SERIES_CONFIG
1818
from .plotter_base import PlotterBase
@@ -111,13 +111,7 @@ def plot(
111111

112112
# Show the figure
113113

114-
# In GitHub CI builds (e.g., during Jupyter Book generation), avoid
115-
#
116-
# calling `fig.show()`
117-
# because it can emit `application/vnd.plotly.v1+json` outputs that some toolchains warn about.
118-
# Instead, convert the figure to HTML and display it directly.
119-
# Use a regular Figure and show it
120-
if not is_github_ci() or display is None or HTML is None:
114+
if is_pycharm() or display is None or HTML is None:
121115
fig.show(config=config)
122116
else:
123117
html_fig = pio.to_html(

tutorials/dmsc-summer-school-2025_analysis-powder-diffraction.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
# introduction to EasyScience, EasyDiffraction is built on that framework and
1414
# offers a high-level interface focused specifically for diffraction analysis.
1515
#
16-
# This notebook is self-contained and designed for hands-on learning.
17-
# For more advanced features and additional capabilities of the EasyDiffraction
18-
# library, please see the official documentation:
19-
# https://docs.easydiffraction.org/lib
20-
2116
# This notebook is self-contained and designed for hands-on learning.
2217
# However, if you're interested in exploring more advanced features or learning
2318
# about additional capabilities of the EasyDiffraction library, please refer to

0 commit comments

Comments
 (0)