cdasws 1.8.6__tar.gz → 1.8.8__tar.gz

{cdasws-1.8.6 → cdasws-1.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdasws
-Version: 1.8.6
+Version: 1.8.8
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
@@ -14,11 +14,12 @@ Description:
         NASA's [Coordinated Data Analysis System](https://cdaweb.gsfc.nasa.gov/)
         (CDAS).  This library implements the client side of the 
         [CDAS RESTful web services](https://cdaweb.gsfc.nasa.gov/WebServices/REST/)
-        and can return data in the 
-        [SpacePy data model](https://spacepy.github.io/datamodel.html) or an
-        [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html)
-        with all the original 
-        [ISTP/SPDF metadata](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html).
+        and can return data in a 
+        [SpacePy datamodel](https://spacepy.github.io/datamodel.html),
+        [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html), or
+        [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html)
+        with all source and 
+        [ISTP/SPDF](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html) metadata.
         Frequently asked questions concerning this library are at 
         [FAQ](https://cdaweb.gsfc.nasa.gov/WebServices/REST/py/FAQ.html).
         For more general details about the CDAS web services, see
@@ -35,9 +36,9 @@ Description:
         Also, the following [Jupyter notebooks](https://jupyter.org/) demonstrate
         different features of the library:
         
-        1. [Basic Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExample.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExample.ipynb)) demonstrating use of library with results returned in [SpacePy data model](https://spacepy.github.io/datamodel.html). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsExample.ipynb).
-        2. [Basic Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExampleXarray.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExampleXarray.ipynb)) demonstrating use of library with results returned in an [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsExampleXarray.ipynb).
-        3. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/sscws-notebooks/main?labpath=SscWsConjunctionExample.ipynb).
+        1. [Data Retrieval](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsDataRetrieval.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsDataRetrieval.ipynb)) demonstrating use of library with results returned in [SpacePy data model](https://spacepy.github.io/datamodel.html), [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html), and [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsDataRetrieval.ipynb).
+        2. [CDAWeb Binning Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsBinningExample.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsBinningExample.ipynb)) demonstrating use [CDAWeb binning](https://cdaweb.gsfc.nasa.gov/CDAWeb_Binning_readme.html). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsBinningExample.ipynb).
+        3. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/sscws-notebooks/main?labpath=SscWsConjunctionExample.ipynb).
         ---
         
         And at the bottom of each 
@@ -61,7 +62,7 @@ Description:
         1. To have get_data return the data in the SpacePy data model.
             * [SpacePy](https://spacepy.github.io/). Refer to the SpacePy
               documentation for the details of SpacePy's dependencies.
-        2. To have get_data return the data in an xarray dataset.
+        2. To have get_data return the data in an [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html) or [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html).
             * [cdflib](https://pypi.org/project/cdflib/).
             * [xarray](https://pypi.org/project/xarray/).
         

{cdasws-1.8.6 → cdasws-1.8.8}/README.md

@@ -6,11 +6,12 @@ and services of
 NASA's [Coordinated Data Analysis System](https://cdaweb.gsfc.nasa.gov/)
 (CDAS).  This library implements the client side of the 
 [CDAS RESTful web services](https://cdaweb.gsfc.nasa.gov/WebServices/REST/)
-and can return data in the 
-[SpacePy data model](https://spacepy.github.io/datamodel.html) or an
-[xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html)
-with all the original 
-[ISTP/SPDF metadata](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html).
+and can return data in a 
+[SpacePy datamodel](https://spacepy.github.io/datamodel.html),
+[xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html), or
+[pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html)
+with all source and 
+[ISTP/SPDF](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html) metadata.
 Frequently asked questions concerning this library are at 
 [FAQ](https://cdaweb.gsfc.nasa.gov/WebServices/REST/py/FAQ.html).
 For more general details about the CDAS web services, see
@@ -27,9 +28,9 @@ To run the included example, do the following
 Also, the following [Jupyter notebooks](https://jupyter.org/) demonstrate
 different features of the library:
 
-1. [Basic Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExample.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExample.ipynb)) demonstrating use of library with results returned in [SpacePy data model](https://spacepy.github.io/datamodel.html). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsExample.ipynb).
-2. [Basic Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExampleXarray.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExampleXarray.ipynb)) demonstrating use of library with results returned in an [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsExampleXarray.ipynb).
-3. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/sscws-notebooks/main?labpath=SscWsConjunctionExample.ipynb).
+1. [Data Retrieval](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsDataRetrieval.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsDataRetrieval.ipynb)) demonstrating use of library with results returned in [SpacePy data model](https://spacepy.github.io/datamodel.html), [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html), and [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsDataRetrieval.ipynb).
+2. [CDAWeb Binning Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsBinningExample.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsBinningExample.ipynb)) demonstrating use [CDAWeb binning](https://cdaweb.gsfc.nasa.gov/CDAWeb_Binning_readme.html). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsBinningExample.ipynb).
+3. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/sscws-notebooks/main?labpath=SscWsConjunctionExample.ipynb).
 ---
 
 And at the bottom of each 
@@ -53,7 +54,7 @@ dependencies are required:
 1. To have get_data return the data in the SpacePy data model.
     * [SpacePy](https://spacepy.github.io/). Refer to the SpacePy
       documentation for the details of SpacePy's dependencies.
-2. To have get_data return the data in an xarray dataset.
+2. To have get_data return the data in an [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html) or [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html).
     * [cdflib](https://pypi.org/project/cdflib/).
     * [xarray](https://pypi.org/project/xarray/).
 

{cdasws-1.8.6 → cdasws-1.8.8}/cdasws/__init__.py

@@ -137,7 +137,7 @@ except ImportError:
         CDF_XARRAY_AVAILABLE = False
 
 
-__version__ = "1.8.6"
+__version__ = "1.8.8"
 
 
 #
@@ -1333,7 +1333,8 @@ class CdasWs:
         CdasWs.get_data
         """
 
-        self.logger.debug('data_request = %s', data_request.json())
+        #self.logger.debug('data_request = %s', data_request.json())
+        self.logger.debug('data_request = %s', data_request.xml_str())
 
         url = self._endpoint + 'datasets'
 

{cdasws-1.8.6 → cdasws-1.8.8}/cdasws/__main__.py

@@ -202,7 +202,7 @@ def example(
                           #    'interpolateMissingValues': True,
                           #    'sigmaMultiplier': 4,
                           #    'overrideDefaultBinning': True
-                          #}
+                          #},
                           dataRepresentation=DataRepresentation.SPACEPY
                           )
 #            cdas.get_data('10.21978/P8PG8V', ['BT'],

{cdasws-1.8.6 → cdasws-1.8.8}/cdasws/datarequest.py

@@ -310,7 +310,7 @@ class DataRequest(metaclass=ABCMeta): # pylint: disable=too-few-public-methods
                 builder.end('ImageFormat')
         if 'BinData' in data_request:
             bin_data = data_request['BinData']
-            builder.start('BinData')
+            builder.start('BinData', {})
             if 'Interval' in bin_data:
                 builder.start('Interval', {})
                 builder.data(str(bin_data['Interval']))

{cdasws-1.8.6 → cdasws-1.8.8}/cdasws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdasws
-Version: 1.8.6
+Version: 1.8.8
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
@@ -14,11 +14,12 @@ Description:
         NASA's [Coordinated Data Analysis System](https://cdaweb.gsfc.nasa.gov/)
         (CDAS).  This library implements the client side of the 
         [CDAS RESTful web services](https://cdaweb.gsfc.nasa.gov/WebServices/REST/)
-        and can return data in the 
-        [SpacePy data model](https://spacepy.github.io/datamodel.html) or an
-        [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html)
-        with all the original 
-        [ISTP/SPDF metadata](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html).
+        and can return data in a 
+        [SpacePy datamodel](https://spacepy.github.io/datamodel.html),
+        [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html), or
+        [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html)
+        with all source and 
+        [ISTP/SPDF](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html) metadata.
         Frequently asked questions concerning this library are at 
         [FAQ](https://cdaweb.gsfc.nasa.gov/WebServices/REST/py/FAQ.html).
         For more general details about the CDAS web services, see
@@ -35,9 +36,9 @@ Description:
         Also, the following [Jupyter notebooks](https://jupyter.org/) demonstrate
         different features of the library:
         
-        1. [Basic Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExample.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExample.ipynb)) demonstrating use of library with results returned in [SpacePy data model](https://spacepy.github.io/datamodel.html). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsExample.ipynb).
-        2. [Basic Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExampleXarray.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsExampleXarray.ipynb)) demonstrating use of library with results returned in an [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsExampleXarray.ipynb).
-        3. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/). [Launch on Binder](https://mybinder.org/v2/gh/berniegsfc/sscws-notebooks/main?labpath=SscWsConjunctionExample.ipynb).
+        1. [Data Retrieval](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsDataRetrieval.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsDataRetrieval.ipynb)) demonstrating use of library with results returned in [SpacePy data model](https://spacepy.github.io/datamodel.html), [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html), and [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsDataRetrieval.ipynb).
+        2. [CDAWeb Binning Example](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsBinningExample.html) ([ipynb file](https://cdaweb.gsfc.nasa.gov/WebServices/REST/jupyter/CdasWsBinningExample.ipynb)) demonstrating use [CDAWeb binning](https://cdaweb.gsfc.nasa.gov/CDAWeb_Binning_readme.html). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/cdasws-notebooks/main?labpath=CdasWsBinningExample.ipynb).
+        3. [Magnetic Field Line Conjunction Example](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.html) ([ipynb file](https://sscweb.gsfc.nasa.gov/WebServices/REST/jupyter/SscWsConjunctionExample.ipynb)) with related data retrieval/plotting using [cdasws](https://pypi.org/project/cdasws/). [Launch on Binder](https://binder.opensci.2i2c.cloud/v2/gh/berniegsfc/sscws-notebooks/main?labpath=SscWsConjunctionExample.ipynb).
         ---
         
         And at the bottom of each 
@@ -61,7 +62,7 @@ Description:
         1. To have get_data return the data in the SpacePy data model.
             * [SpacePy](https://spacepy.github.io/). Refer to the SpacePy
               documentation for the details of SpacePy's dependencies.
-        2. To have get_data return the data in an xarray dataset.
+        2. To have get_data return the data in an [xarray.Dataset](https://docs.xarray.dev/en/stable/generated/xarray.Dataset.html) or [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html).
             * [cdflib](https://pypi.org/project/cdflib/).
             * [xarray](https://pypi.org/project/xarray/).
         

{cdasws-1.8.6 → cdasws-1.8.8}/setup.py

@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
 # This call to setup() does all the work
 setup(
     name="cdasws",
-    version="1.8.6",
+    version="1.8.8",
     description="NASA's Coordinated Data Analysis System Web Service Client Library",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -19,7 +19,7 @@ setup(
     author_email="NASA-SPDF-Support@nasa.onmicrosoft.com",
     license="NOSA",
     packages=["cdasws"],
-#    python_requires=[">3.4"]
+#    python_requires=[">3.6"]
 #    packages=find_packages(exclude=["tests"]),
 #    packages=find_packages(),
     include_package_data=True,