From d48ef72a4815e35b86cce3fd08a8f1229fb0bebe Mon Sep 17 00:00:00 2001 From: Brandon Dube Date: Sat, 15 Dec 2018 23:11:09 -0500 Subject: [PATCH] importerror hotfix --- docs/source/conf.py | 4 ++-- prysm/__init__.py | 2 ++ setup.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 0771b436..e60fa813 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '0.13' +version = '0.13.1' # The full version, including alpha/beta/rc tags. -release = '0.13' +release = '0.13.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/prysm/__init__.py b/prysm/__init__.py index 405b84f9..43d04109 100644 --- a/prysm/__init__.py +++ b/prysm/__init__.py @@ -1,6 +1,7 @@ """prysm, a python optics module.""" from prysm.conf import config +from prysm.convolution import Convolvable from prysm.extras import plot_fourier_chain from prysm.detector import Detector, OLPF, PixelAperture from prysm.pupil import Pupil @@ -68,4 +69,5 @@ 'SiemensStar', 'TiltedSquare', 'SlantedEdge', + 'Convolvable', ] diff --git a/setup.py b/setup.py index 920c803f..9e9f9ad2 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='prysm', - version='0.13', + version='0.13.1', description='A python optics module', long_description='Uses geometrical and fourier optics to model optical systems', license='MIT',