correctly import version for RTD and pip installation

JarronL · Dec 22, 2021 · adce4f8 · adce4f8
1 parent 382b056
commit adce4f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.rtd-environment.yml b/.rtd-environment.yml
@@ -17,6 +17,6 @@ dependencies:
         - docutils==0.16
         - astroquery>=0.4.3
         - pysynphot>=2.0
-        # - poppy>=1.0.1
+        - poppy>=1.0.1
         - webbpsf>=1.0.0
-        # - git+https://github.com/JarronL/webbpsf_ext.git
+        - git+https://github.com/JarronL/webbpsf_ext.git
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -8,7 +8,7 @@ Cython
 astropy>=4.2
 astroquery>=0.4.3
 astropy-helpers>=3.1
-poppy>=1.0
-webbpsf>=1.0
 pysynphot>=2.0
-git+https://github.com/JarronL/webbpsf_ext.git
+poppy>=1.0.1
+webbpsf>=1.0.0
+-e git+https://github.com/JarronL/webbpsf_ext.git
diff --git a/setup.py b/setup.py
@@ -39,7 +39,9 @@
 
 root = path.abspath(path.dirname(__file__))
 
-from pynrc.version import __version__
+# Rather than importing (which will fail due to __init__.py)
+# open and execute the file directly
+exec(open('webbpsf_ext/version.py').read())
 version = __version__
 
 RELEASE = 'dev' not in version