From 5f6dad56fe7b0e6f6a8ae77c9c5f7f2b14800f9c Mon Sep 17 00:00:00 2001
From: paugier <pierre.augier@univ-grenoble-alpes.fr>
Date: Fri, 16 Feb 2024 09:48:01 +0100
Subject: [PATCH] Meson files and readthedocs

---
 .readthedocs.yml                              | 21 ++++++++-----------
 meson.build                                   |  3 +--
 src/fluidimage/calcul/meson.build             |  2 --
 .../calcul/plot_evaluate_subpix/meson.build   | 11 ----------
 src/fluidimage/calibration/meson.build        |  2 --
 src/fluidimage/data_objects/meson.build       |  2 --
 src/fluidimage/executors/meson.build          |  2 --
 src/fluidimage/gui/launcher/meson.build       |  2 --
 src/fluidimage/postproc/meson.build           |  2 --
 src/fluidimage/preproc/meson.build            |  2 --
 src/fluidimage/reconstruct/tomo/meson.build   |  2 --
 src/fluidimage/util/meson.build               |  2 --
 src/fluidimage/works/piv/meson.build          |  2 --
 13 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 src/fluidimage/calcul/plot_evaluate_subpix/meson.build

diff --git a/.readthedocs.yml b/.readthedocs.yml
index be6b059c..1b39e67a 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,21 +1,18 @@
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
 version: 2
 
 build:
   os: ubuntu-22.04
   tools:
     python: "3.11"
+  apt_packages:
+    - graphviz
+  jobs:
+    post_create_environment:
+      - pip install pdm pip -U
+    post_install:
+      - pdm use -f $READTHEDOCS_VIRTUALENV_PATH
+      - pdm sync -G doc -G opencv --no-self
+      - pip install . -C setup-args=-Dtransonic-backend=python
 
 sphinx:
   configuration: doc/conf.py
-
-python:
-  system_packages: true
-  install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - doc
diff --git a/meson.build b/meson.build
index 4ebe2cdf..50f259e0 100644
--- a/meson.build
+++ b/meson.build
@@ -5,8 +5,7 @@ project(
   meson_version: '>= 1.1.0',
   default_options: [
     'buildtype=release',
-    'c_std=c99',
-    'cpp_std=c++14',
+    'cpp_std=c++11',
   ],
 )
 
diff --git a/src/fluidimage/calcul/meson.build b/src/fluidimage/calcul/meson.build
index fab30490..9fcdb924 100644
--- a/src/fluidimage/calcul/meson.build
+++ b/src/fluidimage/calcul/meson.build
@@ -20,11 +20,9 @@ py.install_sources(
 )
 
 subdir('interpolate')
-subdir('plot_evaluate_subpix')
 
 run_command(['transonic', '--meson', '--backend', backend, 'correl.py', 'subpix.py'], check: true)
 
 foreach be : backends
   subdir('__' + be + '__')
 endforeach
-
diff --git a/src/fluidimage/calcul/plot_evaluate_subpix/meson.build b/src/fluidimage/calcul/plot_evaluate_subpix/meson.build
deleted file mode 100644
index 6b4c4189..00000000
--- a/src/fluidimage/calcul/plot_evaluate_subpix/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-
-python_sources = [
-
-]
-
-py.install_sources(
-  python_sources,
-  subdir: 'fluidimage/calcul/plot_evaluate_subpix'
-)
-
-
diff --git a/src/fluidimage/calibration/meson.build b/src/fluidimage/calibration/meson.build
index c03ce607..5bb3e8d6 100644
--- a/src/fluidimage/calibration/meson.build
+++ b/src/fluidimage/calibration/meson.build
@@ -15,5 +15,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/calibration'
 )
-
-
diff --git a/src/fluidimage/data_objects/meson.build b/src/fluidimage/data_objects/meson.build
index f36faaf9..46eb5325 100644
--- a/src/fluidimage/data_objects/meson.build
+++ b/src/fluidimage/data_objects/meson.build
@@ -12,5 +12,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/data_objects'
 )
-
-
diff --git a/src/fluidimage/executors/meson.build b/src/fluidimage/executors/meson.build
index f750b742..ae4a51bb 100644
--- a/src/fluidimage/executors/meson.build
+++ b/src/fluidimage/executors/meson.build
@@ -15,5 +15,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/executors'
 )
-
-
diff --git a/src/fluidimage/gui/launcher/meson.build b/src/fluidimage/gui/launcher/meson.build
index b67001b0..83f146e7 100644
--- a/src/fluidimage/gui/launcher/meson.build
+++ b/src/fluidimage/gui/launcher/meson.build
@@ -10,5 +10,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/gui/launcher'
 )
-
-
diff --git a/src/fluidimage/postproc/meson.build b/src/fluidimage/postproc/meson.build
index f0c9cfed..12dbea57 100644
--- a/src/fluidimage/postproc/meson.build
+++ b/src/fluidimage/postproc/meson.build
@@ -14,5 +14,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/postproc'
 )
-
-
diff --git a/src/fluidimage/preproc/meson.build b/src/fluidimage/preproc/meson.build
index 4aae6836..6f97f1f1 100644
--- a/src/fluidimage/preproc/meson.build
+++ b/src/fluidimage/preproc/meson.build
@@ -15,5 +15,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/preproc'
 )
-
-
diff --git a/src/fluidimage/reconstruct/tomo/meson.build b/src/fluidimage/reconstruct/tomo/meson.build
index 468a2072..a06cdd59 100644
--- a/src/fluidimage/reconstruct/tomo/meson.build
+++ b/src/fluidimage/reconstruct/tomo/meson.build
@@ -9,5 +9,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/reconstruct/tomo'
 )
-
-
diff --git a/src/fluidimage/util/meson.build b/src/fluidimage/util/meson.build
index 5cc7e9f0..7a49f626 100644
--- a/src/fluidimage/util/meson.build
+++ b/src/fluidimage/util/meson.build
@@ -10,5 +10,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/util'
 )
-
-
diff --git a/src/fluidimage/works/piv/meson.build b/src/fluidimage/works/piv/meson.build
index 4cd9680b..5e3172c0 100644
--- a/src/fluidimage/works/piv/meson.build
+++ b/src/fluidimage/works/piv/meson.build
@@ -12,5 +12,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/works/piv'
 )
-
-