From f06fd25ce2ce93e73bc9dfa951de0c5e19304f1f Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:12:49 -0400 Subject: [PATCH 1/2] Added missing docstring in setup.get_data --- desk/__init__.py | 4 ++-- desk/set_up/get_data.py | 3 +++ setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/desk/__init__.py b/desk/__init__.py index 667e86e1..d0ad3d9b 100644 --- a/desk/__init__.py +++ b/desk/__init__.py @@ -8,9 +8,9 @@ # Top-level package for Dusty-Evolved-Star-Kit. __author__ = "Steven R. Goldman" -__email__ = "sgoldman@stsci.edu" +__email__ = "sgoldman@usra.edu" __title__ = "DESK" -__version__ = "1.8.15" +__version__ = "1.8.16" __repository__ = "https://github.com/s-goldman/Dusty-Evolved-Star-Kit" __date_published = "2021-09-17" __licence__ = "BSD" diff --git a/desk/set_up/get_data.py b/desk/set_up/get_data.py index f6bdef58..d60275ea 100644 --- a/desk/set_up/get_data.py +++ b/desk/set_up/get_data.py @@ -22,6 +22,9 @@ def get_values(filename, min_wavelength=0, max_wavelength=1000, fitting=False): The maximum wavelength in um to fit the data. min_wavelength:float The maximum wavelength in um to fit the data + fitting: bool + Whether fitting or displaying data. If fitting, function will trim + data using min_wavelength and max_wavelength. Returns ------- diff --git a/setup.py b/setup.py index 1d633e93..af0a7e65 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,6 @@ test_suite="tests", tests_require=["pytest", "sphinx_automodapi"], url="https://github.com/s-goldman/Dusty_Evolved_Star_Kit", - version="1.8.15", + version="1.8.16", zip_safe=False, ) From 5c660a778d52d16ebaaf8c81a971021663934def Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:13:28 -0400 Subject: [PATCH 2/2] small change to docstring --- desk/set_up/get_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/set_up/get_data.py b/desk/set_up/get_data.py index d60275ea..e9331945 100644 --- a/desk/set_up/get_data.py +++ b/desk/set_up/get_data.py @@ -23,7 +23,7 @@ def get_values(filename, min_wavelength=0, max_wavelength=1000, fitting=False): min_wavelength:float The maximum wavelength in um to fit the data fitting: bool - Whether fitting or displaying data. If fitting, function will trim + Whether fitting or displaying data. If fitting=True, function will trim data using min_wavelength and max_wavelength. Returns