Meson files and readthedocs

fluiddyn · Feb 16, 2024 · 5f6dad5 · 5f6dad5
1 parent 0966643
commit 5f6dad5
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,5 +12,3 @@ py.install_sources(
   python_sources,
   subdir: 'fluidimage/works/piv'
 )
-
-