From cf5e3f195b2efcbe0b9dfa18ef88a50c87e78f86 Mon Sep 17 00:00:00 2001
From: Eric Prestat <eric.prestat@gmail.com>
Date: Thu, 30 May 2024 19:58:55 +0100
Subject: [PATCH 1/2] Add `upcoming` tags to display upcoming events in the
landing page. Add link to teaching materials of diamond workshop
---
index.rst | 3 ++-
news/EMC2024.rst | 2 +-
news/NTNU2024.rst | 2 +-
news/eBEAM2024.rst | 2 +-
news/ePSIC2024.rst | 6 +++---
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/index.rst b/index.rst
index d99a796b..b74c007f 100644
--- a/index.rst
+++ b/index.rst
@@ -104,9 +104,10 @@
Latest News
-.. postlist:: 3
+.. postlist::
:list-style: circle
:format: {title}
+ :tags: upcoming
.. _ecosystem_label:
diff --git a/news/EMC2024.rst b/news/EMC2024.rst
index 55c67f90..5a21400c 100644
--- a/news/EMC2024.rst
+++ b/news/EMC2024.rst
@@ -1,5 +1,5 @@
.. post:: 2024-01-06
- :tags: training, EMC
+ :tags: training, EMC, upcoming
:category: event
HyperSpy Workshop @ EMC2024, 25th of August 2024
diff --git a/news/NTNU2024.rst b/news/NTNU2024.rst
index 3fc292aa..224a481b 100644
--- a/news/NTNU2024.rst
+++ b/news/NTNU2024.rst
@@ -1,5 +1,5 @@
.. post:: 2024-01-12
- :tags: training
+ :tags: training, upcoming
:category: event
Analysis of 4D-STEM DATA @ NTNU, 11-13th of June 2024
diff --git a/news/eBEAM2024.rst b/news/eBEAM2024.rst
index e63cbcc3..fb7877b5 100644
--- a/news/eBEAM2024.rst
+++ b/news/eBEAM2024.rst
@@ -1,5 +1,5 @@
.. post:: 2024-01-11
- :tags: training, summer-school, lumiSpy, eXSpy
+ :tags: training, summer-school, lumiSpy, eXSpy, upcoming
:category: event
HyperSpy lecture and tutorial @ eBEAM summer school, Sept. 1-13, 2024
diff --git a/news/ePSIC2024.rst b/news/ePSIC2024.rst
index c918b91b..743746fa 100644
--- a/news/ePSIC2024.rst
+++ b/news/ePSIC2024.rst
@@ -7,11 +7,11 @@ HyperSpy Workshop @ Diamond, 13-17th of May 2024
We are happy to announce the HyperSpy workshop @ Diamond will take place online the 13-17th of May 2024.
-More information and registration `on the Diamond website <https://www.diamond.ac.uk/Home/Events/2024/HyperSpy-Workshop-2024.html>`_.
+Registration on the `Diamond website <https://www.diamond.ac.uk/Home/Events/2024/HyperSpy-Workshop-2024.html>`_
-The teaching material will be available closer to the event.
+More information and teaching materials on the `ePSIC documentation website <https://diamondlightsource.atlassian.net/wiki/spaces/EPSICWEB/pages/1088061441/Hyperspy+Workshop-+2024>`_.
.. image:: https://www.diamond.ac.uk/.resources/DiamondLightModule/webresources/img/Diamond-logo-colour.png
:alt: Diamond logo
:width: 200
- :target: https://www.diamond.ac.uk/Home/Events/2024/HyperSpy-Workshop-2024.html
+ :target: https://diamondlightsource.atlassian.net/wiki/spaces/EPSICWEB/pages/1088061441/Hyperspy+Workshop-+2024
From 8bc954929a94cdfbefb3e82a69579fd3fb910a4d Mon Sep 17 00:00:00 2001
From: Eric Prestat <eric.prestat@gmail.com>
Date: Thu, 30 May 2024 20:41:22 +0100
Subject: [PATCH 2/2] Fix broken link
---
conf.py | 4 ++++
news/new_demos_scandem.rst | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/conf.py b/conf.py
index 5d922a2e..7153d1d3 100644
--- a/conf.py
+++ b/conf.py
@@ -28,6 +28,10 @@
'selective_css',
]
+linkcheck_ignore = [
+ "https://sbmm.org.br/en/28o-csbmm", # 403 Client Error: Forbidden for url
+]
+
# sitemap settings
html_baseurl = environ.get("SPHINX_HTML_BASE_URL", "https://hyperspy.org")
sitemap_locales = [None]
diff --git a/news/new_demos_scandem.rst b/news/new_demos_scandem.rst
index a7191170..75f94de6 100644
--- a/news/new_demos_scandem.rst
+++ b/news/new_demos_scandem.rst
@@ -11,7 +11,7 @@ The new demos are:
* `Getting started with HyperSpy <https://nbviewer.org/github/hyperspy/hyperspy-demos/blob/main/1_Getting_Started.ipynb>`_
* `HyperSpy fitting tutorial <https://nbviewer.org/github/hyperspy/hyperspy-demos/blob/main/Fitting_tutorial.ipynb>`_
-* `EELS analysis tutorial <https://nbviewer.org/github/hyperspy/hyperspy-demos/blob/main/electron_microscopy/EELS/EELS_analysis.ipynb>`_
+* `EELS analysis tutorial <https://nbviewer.org/github/hyperspy/exspy-demos/blob/main/EELS/EELS_analysis.ipynb>`_
The demos are
in the form of IPython notebooks and contain examples of usage. They can be