cdasws 1.7.46__tar.gz → 1.8.2__tar.gz

{cdasws-1.7.46 → cdasws-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdasws
-Version: 1.7.46
+Version: 1.8.2
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris

{cdasws-1.7.46 → cdasws-1.8.2}/cdasws/__init__.py

@@ -41,10 +41,17 @@ the United States under Title 17, U.S.Code. All Other Rights Reserved.
 
 Notes
 -----
-Due to rate limiting implemented by the CDAS web services, an attempt
-to make simultaneous requests from many threads is likely to actually
-reduce performance.  At this time, it is best to make calls from
-five or fewer threads.
+<ul>
+  <li>Due to rate limiting implemented by the CDAS web services, an
+      attempt to make simultaneous requests from many threads is likely
+      to actually reduce performance.  At this time, it is best to make
+      calls from five or fewer threads.</li>
+  <li>Since CDAS data has datetime values with a UTC timezone, all
+      client provided datetime values should have a timezone of UTC.
+      If a given value's timezone is not UTC, the value is adjusted to
+      UTC.  If a given value has no timezone (is naive), a UTC timezone
+      is set.</li>
+</ul>
 """
 
 
@@ -120,7 +127,7 @@ except ImportError:
         CDF_XARRAY_AVAILABLE = False
 
 
-__version__ = "1.7.46"
+__version__ = "1.8.2"
 
 
 #
@@ -610,11 +617,13 @@ class CdasWs:
             that no datasets are eliminated based upon their instrument
             value.<br>
             <b>startDate</b> - a datetime specifying the start of a time
-            interval.  If this parameter is ommited, the time interval
-            will begin infinitely in the past.<br>
+            interval.  See module note about timezone value.  If this
+            parameter is ommited, the time interval will begin infinitely
+            in the past.<br>
             <b>stopDate</b> - a datetime specifying the end of a time
-            interval.  If this parameter is omitted, the time interval
-            will end infinitely in the future.<br>
+            interval.  See module note about timezone value.  If this
+            parameter is omitted, the time interval will end infinitely
+            in the future.<br>
             <b>idPattern</b> - a java.util.regex compatible regular
             expression that must match the dataset's identifier value.
             Omitting this parameter is equivalent to `.*`.<br>
@@ -1025,9 +1034,9 @@ class CdasWs:
         variables
             array containing names of variables to get.
         start
-            start time of data to get.
+            start time of data to get.  See module note about timezone.
         end
-            end time of data to get.
+            end time of data to get.  See module note about timezone.
         keywords
             optional keyword parameters as follows:<br>
             <b>binData</b> - indicates that uniformly spaced values should
@@ -1263,10 +1272,11 @@ class CdasWs:
             ALL-VARIABLES may be used instead of specifying all the
             individual variable names.
         time0
-            TimeInterval(s) or start time of data to get.
+            TimeInterval(s) or start time of data to get.  See module
+            note about timezone.
         time1
             when time0 is not one or more TimeInterval(s), the end time
-            of data to get.
+            of data to get.  See module note about timezone.
         keywords
             optional keyword parameters as follows:<br>
             <b>binData</b> - indicates that uniformly spaced values should
@@ -1449,9 +1459,9 @@ class CdasWs:
         variables
             array containing names of variables to get.
         start
-            start time of data to get.
+            start time of data to get.  See module note about timezone.
         end
-            end time of data to get.
+            end time of data to get.  See module note about timezone.
         options
             graph options.
         image_format
@@ -1552,9 +1562,9 @@ class CdasWs:
         variables
             array containing names of variables to get.
         start
-            start time of data to get.
+            start time of data to get.  See module note about timezone.
         end
-            end time of data to get.
+            end time of data to get.  See module note about timezone.
         identifier
             thumbnail identifier (returned in a previous get_graph
             result).
@@ -1651,9 +1661,9 @@ class CdasWs:
         variables
             array containing names of variables to get.
         start
-            start time of data to get.
+            start time of data to get.  See module note about timezone.
         end
-            end time of data to get.
+            end time of data to get.  See module note about timezone.
         compression
             file compression.
         text_format
@@ -1753,9 +1763,9 @@ class CdasWs:
         variables
             array containing names of variables to get.
         start
-            start time of data to get.
+            start time of data to get.  See module note about timezone.
         end
-            end time of data to get.
+            end time of data to get.  See module note about timezone.
         keywords
             optional keyword parameters as follows:<br>
             <b>binData</b> - indicates that uniformly spaced values should
@@ -1848,9 +1858,9 @@ class CdasWs:
         dataset
             dataset identifier of data to get.
         start
-            start time of data to get.
+            start time of data to get.  See module note about timezone.
         end
-            end time of data to get.
+            end time of data to get.  See module note about timezone.
         keywords
             optional keyword parameters as follows:<br>
             <b>progressCallback</b> - is a

{cdasws-1.7.46 → cdasws-1.8.2}/cdasws/timeinterval.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2018-2021 United States Government as represented by
+# Copyright (c) 2018-2024 United States Government as represented by
 # the National Aeronautics and Space Administration. No copyright is
 # claimed in the United States under Title 17, U.S.Code. All Other
 # Rights Reserved.
@@ -35,7 +35,7 @@
 Package defining a class to represent the TimeInterval class from
 <https://cdaweb.gsfc.nasa.gov/WebServices/REST/CDAS.xsd>.<br>
 
-Copyright &copy; 2018-2021 United States Government as represented by the
+Copyright &copy; 2018-2024 United States Government as represented by the
 National Aeronautics and Space Administration. No copyright is claimed in
 the United States under Title 17, U.S.Code. All Other Rights Reserved.
 """
@@ -53,6 +53,14 @@ class TimeInterval:
     A class representing a TimeInterval class from
     <https://cdaweb.gsfc.nasa.gov/WebServices/REST/CDAS.xsd>.
 
+    Notes
+    -----
+    Since CDAS data uses datetime values with a UTC timezone,
+    the resulting start and end properties have a UTC timezone.  If
+    the given values' timezone is not UTC, the start/end values are
+    adjusted to UTC.  If the given value has no timezone (is naive) a
+    UTC value is set.
+
     Parameters
     ----------
     start
@@ -135,7 +143,11 @@ class TimeInterval:
     @staticmethod
     def get_datetime(value: Union[datetime, str]) -> datetime:
         """
-        Produces a datetime representation of the given value.
+        Produces a datetime representation of the given value.  The
+        returned datetime always has a timezone of timezone.utc.  If
+        the given value's timezone is not utc, the return value is
+        adjusted to utc.  If the given value has no timezone (is naive)
+        a utc value is set.
 
         Parameters
         ----------
@@ -144,7 +156,8 @@ class TimeInterval:
         Returns
         -------
         datetime
-            datetime representation of the given value.
+            datetime representation of the given value in the UTC
+            timezone.
         Raises
         ------
         ValueError
@@ -157,9 +170,11 @@ class TimeInterval:
         else:
             raise ValueError('unrecognized datetime value')
 
-        datetime_value.astimezone(timezone.utc)
+        if datetime_value.tzinfo is None or \
+           datetime_value.tzinfo.utcoffset(None) is None:
+            return datetime_value.replace(tzinfo=timezone.utc)
 
-        return datetime_value
+        return datetime_value.astimezone(timezone.utc)
 
 
     @staticmethod

{cdasws-1.7.46 → cdasws-1.8.2}/cdasws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdasws
-Version: 1.7.46
+Version: 1.8.2
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris

{cdasws-1.7.46 → cdasws-1.8.2}/cdasws.egg-info/requires.txt

@@ -1,8 +1,9 @@
 python-dateutil>=2.8.0
 requests>=2.20
+urllib3>=1.24.1
 
 [spdm]
-spacepy>=0.1.6
+spacepy>=0.5.0
 
 [xarray]
 cdflib>=0.4.4

{cdasws-1.7.46 → cdasws-1.8.2}/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.7.46",
+    version="1.8.2",
     description="NASA's Coordinated Data Analysis System Web Service Client Library",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -22,10 +22,10 @@ setup(
 #    packages=find_packages(exclude=["tests"]),
 #    packages=find_packages(),
     include_package_data=True,
-#    install_requires=["python-dateutil>=2.8.0", "requests>=2.20", "spacepy>=0.1.6"],
-    install_requires=["python-dateutil>=2.8.0", "requests>=2.20"],
+#    install_requires=["python-dateutil>=2.8.0", "requests>=2.20", "urllib3>=1.24.1", "spacepy>=0.5.0"],
+    install_requires=["python-dateutil>=2.8.0", "requests>=2.20", "urllib3>=1.24.1"],
     extras_require={
-        'spdm': ["spacepy>=0.1.6"],
+        'spdm': ["spacepy>=0.5.0"],
         'xarray': ["cdflib>=0.4.4"],
     },
     keywords=["heliophysics", "coordinated data analysis", "multi-mission", "multi-instrument", "space physics", "spdf", "cdaweb"],