Merge branch 'master' into develop

README.md

@@ -36,15 +36,16 @@ On MacOS *pvtrace* can be installed easily using [pyenv](https://github.com/pyen
 
 Create a clean virtual environment for pvtrace
 
-    pyenv virtualenv 3.8.4 pvtrace-env
+    pyenv install 3.7.9
+    pyenv virtualenv 3.7.9 pvtrace-env
     pyenv activate pvtrace-env
     pip install pvtrace
 
 ## Linux and Windows using Conda
 
-On Linux and Windows you must use conda to create the python environment. Optionally you can also use this method on MacOS too if you prefer Conda over pyenv.
+On Linux and Windows you must use conda to create the python environment. Optionally you can also use this method on MacOS too if you prefer conda over pyenv.
 
-    conda create --name pvtrace-env python=3.8
+    conda create --name pvtrace-env python=3.7.9
     conda activate pvtrace-env
     conda install Rtree
     pip install pvtrace

setup.py

@@ -21,20 +21,10 @@
     download_url="https://github.com/danieljfarrell/pvtrace/archive/{}.tar.gz".format(
         __version__
     ),
-    python_requires=">=3.7.2",
+    python_requires=">=3.7.2,<3.8",
     packages=find_packages(),
-    keywords=[
-        "optics",
-        "simulation",
-        "ray tracing",
-        "photovoltaics",
-        "solar",
-        "energy",
-        "nonimaging",
-        "luminescence",
-        "spectroscopy",
-    ],
-    install_requires=["numpy", "anytree", "trimesh[easy]", "meshcat>=0.0.16"],
+    keywords=["optics", "raytracing", "photovoltaics", "energy"],
+    install_requires=["numpy", "pandas", "anytree", "meshcat>=0.0.16", "trimesh[easy]"],
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Science/Research",
@@ -43,6 +33,6 @@
         "Topic :: Scientific/Engineering :: Chemistry",
         "Topic :: Scientific/Engineering :: Visualization",
         "License :: OSI Approved :: BSD License",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.7",
     ],
 )