Merge branch 'add-to-setup-fix'

csyhuang · Mar 2, 2023 · 33ec4d3 · 33ec4d3
2 parents b0ec542 + b4d29be
commit 33ec4d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -76,9 +76,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.6.4'
+version = u'0.6.5'
 # The full version, including alpha/beta/rc tags.
-release = u'0.6.4'
+release = u'0.6.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/hn2016_falwa/__init__.py b/hn2016_falwa/__init__.py
@@ -4,7 +4,7 @@
 Author: Clare Huang, Christopher Polster
 """
 
-__version__ = "0.6.4"
+__version__ = "0.6.5"
 from .interpolate_fields import interpolate_fields
 from .interpolate_fields_direct_inv import interpolate_fields_direct_inv
 from .compute_qref_and_fawa_first import compute_qref_and_fawa_first

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-## Python Library: hn2016_falwa (v0.6.4)
+## Python Library: hn2016_falwa (v0.6.5)
 
 [![Build Status](https://github.com/csyhuang/hn2016_falwa/actions/workflows/workflow.yml/badge.svg)](https://github.com/csyhuang/hn2016_falwa/actions/workflows/workflow.yml)[![codecov.io](https://codecov.io/gh/csyhuang/hn2016_falwa/branch/master/graph/badge.svg)](https://codecov.io/gh/csyhuang/hn2016_falwa)[![Documentation Status](https://readthedocs.org/projects/hn2016-falwa/badge/?version=latest)](http://hn2016-falwa.readthedocs.io/en/latest/?badge=latest)[![DOI](https://zenodo.org/badge/63908662.svg)](https://zenodo.org/badge/latestdoi/63908662)
 

diff --git a/setup.py b/setup.py
@@ -17,8 +17,7 @@
     proposed in Nakamura (1996) (Also, see Allen and Nakamura (2003)) and the (zonal mean)
     finite-amplitude wave activity in spherical geometry as in Nakamura and Solomon (2010).
     
-    Links:
-    -----
+    Links:    
     - Source code: http://github.com/csyhuang/hn2016_falwa/
     """
 
@@ -61,17 +60,18 @@
 
 setup(
     name='hn2016_falwa',
-    version='0.6.4',
+    version='0.6.5',
     description='python package to compute finite-amplitude local wave activity (Huang and Nakamura 2016, JAS)',
     long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/markdown',
     url='https://github.com/csyhuang/hn2016_falwa',
     author='Clare S. Y. Huang',
     author_email='[email protected]',
     license='MIT',
     packages=find_packages(),
+    install_requires=['numpy', 'scipy', 'xarray'],
     setup_requires=['pytest-runner'],
     tests_require=['pytest'],
-    extras_require={"Xarray": ["xarray"]},
     test_suite="tests",
     ext_modules=[ext1, ext2, ext3, ext4, ext5, ext6, ext7, ext8, ext9],
     zip_safe=False