diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 7d33a50a..b8a41df8 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -27,15 +27,14 @@ extra: name: EasyDiffraction Library Source Code on GitHub # Jupyter notebooks -plugins: - - mkdocs-jupyter: - execute_ignore: - - 'quick*.ipynb' - - 'basic*.ipynb' - - 'advanced*.ipynb' - - 'cryst*.ipynb' - - 'pdf*.ipynb' -# - '*emcee*.ipynb' # Ignore notebooks with 'emcee' in the name from execution +#plugins: +# - mkdocs-jupyter: +# execute_ignore: +# - 'quick*.ipynb' +# - 'basic*.ipynb' +# - 'advanced*.ipynb' +# - 'cryst*.ipynb' +# - 'pdf*.ipynb' ################## # Add new settings diff --git a/pyproject.toml b/pyproject.toml index 318f603c..a0d65abc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,10 +65,10 @@ docs = [ 'pyyaml', # YAML parser ] visualization = [ - 'darkdetect', # Detecting dark mode - 'pandas', # Displaying tables in juptyer notebooks - 'plotly<6.1.0', # Interactive plots. 0.6.0 => Empty charts in Jupyter notebooks ... - 'py3Dmol', # Visualisation of crystal structures + 'darkdetect', # Detecting dark mode + 'pandas', # Displaying tables in juptyer notebooks + 'plotly', # Interactive plots + 'py3Dmol', # Visualisation of crystal structures ] [project.urls] @@ -115,7 +115,7 @@ source = 'versioningit' # Use versioningit to manage the version [tool.versioningit.format] distance = '{base_version}+d{distance}' # example: 0.5.8+d3, 1.2.3.post4+d2 dirty = '{base_version}' # example: 0.5.8, 1.2.3.post4 -distance-dirty = '{base_version}+d{distance}' # +distance-dirty = '{base_version}+d{distance}' # see 1st example # Configure how versioningit detects versions from Git # - 'match' ensures it only considers tags starting with 'v' diff --git a/src/easydiffraction/plotting/plotters/plotter_plotly.py b/src/easydiffraction/plotting/plotters/plotter_plotly.py index af31dd95..ef397b5e 100644 --- a/src/easydiffraction/plotting/plotters/plotter_plotly.py +++ b/src/easydiffraction/plotting/plotters/plotter_plotly.py @@ -12,7 +12,7 @@ display = None HTML = None -from easydiffraction.utils.utils import is_github_ci +from easydiffraction.utils.utils import is_pycharm from .plotter_base import SERIES_CONFIG from .plotter_base import PlotterBase @@ -111,13 +111,7 @@ def plot( # Show the figure - # In GitHub CI builds (e.g., during Jupyter Book generation), avoid - # - # calling `fig.show()` - # because it can emit `application/vnd.plotly.v1+json` outputs that some toolchains warn about. - # Instead, convert the figure to HTML and display it directly. - # Use a regular Figure and show it - if not is_github_ci() or display is None or HTML is None: + if is_pycharm() or display is None or HTML is None: fig.show(config=config) else: html_fig = pio.to_html( diff --git a/tutorials/dmsc-summer-school-2025_analysis-powder-diffraction.py b/tutorials/dmsc-summer-school-2025_analysis-powder-diffraction.py index bac31a05..de53449e 100644 --- a/tutorials/dmsc-summer-school-2025_analysis-powder-diffraction.py +++ b/tutorials/dmsc-summer-school-2025_analysis-powder-diffraction.py @@ -13,11 +13,6 @@ # introduction to EasyScience, EasyDiffraction is built on that framework and # offers a high-level interface focused specifically for diffraction analysis. # -# This notebook is self-contained and designed for hands-on learning. -# For more advanced features and additional capabilities of the EasyDiffraction -# library, please see the official documentation: -# https://docs.easydiffraction.org/lib - # This notebook is self-contained and designed for hands-on learning. # However, if you're interested in exploring more advanced features or learning # about additional capabilities of the EasyDiffraction library, please refer to