Skip to content

Commit

Permalink
Merge pull request #343 from robelgeda/docs
Browse files Browse the repository at this point in the history
Fix RTD builds
  • Loading branch information
mperrin authored Nov 25, 2019
2 parents a593908 + 6e86a1b commit a276feb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
4 changes: 3 additions & 1 deletion docs/rtd-pip-requirements
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
stsci_rtd_theme
numpy
numpy >= 1.13
matplotlib
Cython
astropy-helpers
astropy
sphinx-astropy
sphinx_issues
nbsphinx
5 changes: 4 additions & 1 deletion poppy/optics.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from . import utils
from . import conf
from . import accel_math
from .version import version
from .poppy_core import OpticalElement, Wavefront, BaseWavefront, PlaneType, _RADIANStoARCSEC
from .accel_math import _exp, _r, _float, _complex
from . import geometry
Expand Down Expand Up @@ -244,6 +243,10 @@ def to_fits(self, outname=None, what='amplitude', wavelength=1e-6 * u.meter, npi
See the sample() function for additional optional parameters.
"""
try:
from .version import version
except ImportError:
version = ''

kwargs['return_scale'] = True

Expand Down
7 changes: 0 additions & 7 deletions readthedocs.yml

This file was deleted.

0 comments on commit a276feb

Please sign in to comment.