Skip to content

Commit

Permalink
Merge branch 'topic/default/prepare-0.4.0rc2' into 'branch/default'
Browse files Browse the repository at this point in the history
0.4.0rc2 Fix import fluidfft from sphinx to build the doc of another package

See merge request fluiddyn/fluidfft!58
  • Loading branch information
paugier committed Feb 11, 2024
2 parents e7bbb9c + f829995 commit 5108848
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@

from fluiddyn.util import modification_date

os.environ["FLUIDFFT_BUILD_DOC"] = "1"


import fluidfft
import fluidfft.bench_analysis
from fluidfft.bench_analysis import plot_scaling
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = 'mesonpy'

[project]
name = "fluidfft"
version = "0.4.0rc1"
version = "0.4.0rc2"
description = "Efficient and easy Fast Fourier Transform (FFT) for Python."
authors = [
{name = "Pierre Augier", email = "pierre.augier@legi.cnrs.fr"},
Expand Down
3 changes: 2 additions & 1 deletion src/fluidfft/fft2d/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class :class:`fluidfft.fft2d.operators.OperatorsPseudoSpectral2D` defined in
"""

import os
import sys

from .. import _get_classes
Expand All @@ -34,7 +35,7 @@ class :class:`fluidfft.fft2d.operators.OperatorsPseudoSpectral2D` defined in
"get_classes_mpi",
]

if "sphinx" in sys.modules:
if "FLUIDFFT_BUILD_DOC" in os.environ:
from .fake_mod_fft2d_for_doc import FFT2dFakeForDoc


Expand Down
3 changes: 2 additions & 1 deletion src/fluidfft/fft3d/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class :class:`fluidfft.fft3d.operators.OperatorsPseudoSpectral3D` defined in
"""

import os
import sys

from .. import _get_classes
Expand All @@ -34,7 +35,7 @@ class :class:`fluidfft.fft3d.operators.OperatorsPseudoSpectral3D` defined in
"get_classes_mpi",
]

if "sphinx" in sys.modules:
if "FLUIDFFT_BUILD_DOC" in os.environ:
from .fake_mod_fft3d_for_doc import FFT3dFakeForDoc


Expand Down

0 comments on commit 5108848

Please sign in to comment.