python-cmr - pypi Package Compare versions

Comparing version 0.5.0 to 0.6.0

cmr/__init__.py

@@ -1,3 +0,3 @@
-from .queries import GranuleQuery, CollectionQuery
+from .queries import GranuleQuery, CollectionQuery, ToolQuery, ServiceQuery, VariableQuery
 
-__all__ = ["GranuleQuery", "CollectionQuery"]
+__all__ = ["GranuleQuery", "CollectionQuery", "ToolQuery", "ServiceQuery", "VariableQuery"]

cmr/queries.py

@@ -232,2 +232,4 @@ """
 
+        return self
+
     def provider(self, provider):
@@ -759,3 +761,3 @@ """
 
-class ToolServiceBaseQuery(Query):
+class ToolServiceVariableBaseQuery(Query):
     """
@@ -829,3 +831,3 @@ Base class for Tool and Service CMR queries.
 
-class ToolQuery(ToolServiceBaseQuery):
+class ToolQuery(ToolServiceVariableBaseQuery):
     """
@@ -846,3 +848,3 @@ Class for querying tools from the CMR.
 
-class ServiceQuery(ToolServiceBaseQuery):
+class ServiceQuery(ToolServiceVariableBaseQuery):
     """
@@ -860,2 +862,14 @@ Class for querying services from the CMR.
     def _valid_state(self):
+        return True
+
+
+class VariableQuery(ToolServiceVariableBaseQuery):
+    def __init__(self, mode=CMR_OPS):
+        Query.__init__(self, "variables", mode)
+        self.concept_id_chars = ['V']
+        self._valid_formats_regex.extend([
+            "dif", "dif10", "opendata", "umm_json", "umm_json_v[0-9]_[0-9]"
+        ])
+
+    def _valid_state(self):
         return True

PKG-INFO

 Metadata-Version: 2.1
 Name: python-cmr
-Version: 0.5.0
+Version: 0.6.0
 Summary: Python wrapper to the NASA Common Metadata Repository (CMR) API.
@@ -25,3 +25,3 @@ Home-page: https://github.com/nasa/python_cmr
 
-    >>> from cmr import CollectionQuery, GranuleQuery
+    >>> from cmr import CollectionQuery, GranuleQuery, ToolQuery, ServiceQuery, VariableQuery
 
@@ -55,3 +55,3 @@ >>> api = CollectionQuery()
 
-    $ git clone https://github.com/jddeal/python-cmr
+    $ git clone https://github.com/nasa/python_cmr
     $ cd python-cmr
@@ -154,2 +154,5 @@ $ pip install .
 
+    # Search via concept_id
+    >>> api.concept_id('S1962070864-POCLOUD')
+
 Tool searches support the following methods
@@ -167,2 +170,20 @@
 
+    # Search via concept_id
+    >>> api.concept_id('TL2092786348-POCLOUD')
+
+Variable searches support the following methods
+
+    # Search via provider
+    >>> api = VariableQuery()
+    >>> api.provider('POCLOUD')
+
+    # Search via native_id
+    >>> api.native_id('JASON_CS_S6A_L2_AMR_RAD_STATIC_CALIBRATION-AMR_Side_1-acc_lat')
+
+    # Search via name
+    >>> api.name('/AMR_Side_1/acc_lat')
+
+    # Search via concept_id
+    >>> api.concept_id('V2112019824-POCLOUD')
+
 As an alternative to chaining methods together to set the parameters of your query, a method exists to allow you to pass your parameters as keyword arguments:
@@ -169,0 +190,0 @@

python_cmr.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: python-cmr
-Version: 0.5.0
+Version: 0.6.0
 Summary: Python wrapper to the NASA Common Metadata Repository (CMR) API.
@@ -25,3 +25,3 @@ Home-page: https://github.com/nasa/python_cmr
 
-    >>> from cmr import CollectionQuery, GranuleQuery
+    >>> from cmr import CollectionQuery, GranuleQuery, ToolQuery, ServiceQuery, VariableQuery
 
@@ -55,3 +55,3 @@ >>> api = CollectionQuery()
 
-    $ git clone https://github.com/jddeal/python-cmr
+    $ git clone https://github.com/nasa/python_cmr
     $ cd python-cmr
@@ -154,2 +154,5 @@ $ pip install .
 
+    # Search via concept_id
+    >>> api.concept_id('S1962070864-POCLOUD')
+
 Tool searches support the following methods
@@ -167,2 +170,20 @@
 
+    # Search via concept_id
+    >>> api.concept_id('TL2092786348-POCLOUD')
+
+Variable searches support the following methods
+
+    # Search via provider
+    >>> api = VariableQuery()
+    >>> api.provider('POCLOUD')
+
+    # Search via native_id
+    >>> api.native_id('JASON_CS_S6A_L2_AMR_RAD_STATIC_CALIBRATION-AMR_Side_1-acc_lat')
+
+    # Search via name
+    >>> api.name('/AMR_Side_1/acc_lat')
+
+    # Search via concept_id
+    >>> api.concept_id('V2112019824-POCLOUD')
+
 As an alternative to chaining methods together to set the parameters of your query, a method exists to allow you to pass your parameters as keyword arguments:
@@ -169,0 +190,0 @@

README.md

@@ -14,3 +14,3 @@ This repository is a copy of [jddeal/python_cmr](https://github.com/jddeal/python-cmr/tree/ef0f9e7d67ce99d342a568bd6a098c3462df16d2) which is no longer maintained. It has been copied here with the permission of the original author for the purpose of continuing to develop a python library that can be used for CMR access.
 
-    >>> from cmr import CollectionQuery, GranuleQuery
+    >>> from cmr import CollectionQuery, GranuleQuery, ToolQuery, ServiceQuery, VariableQuery
 
@@ -44,3 +44,3 @@ >>> api = CollectionQuery()
 
-    $ git clone https://github.com/jddeal/python-cmr
+    $ git clone https://github.com/nasa/python_cmr
     $ cd python-cmr
@@ -143,2 +143,5 @@ $ pip install .
 
+    # Search via concept_id
+    >>> api.concept_id('S1962070864-POCLOUD')
+
 Tool searches support the following methods
@@ -156,2 +159,20 @@
 
+    # Search via concept_id
+    >>> api.concept_id('TL2092786348-POCLOUD')
+
+Variable searches support the following methods
+
+    # Search via provider
+    >>> api = VariableQuery()
+    >>> api.provider('POCLOUD')
+
+    # Search via native_id
+    >>> api.native_id('JASON_CS_S6A_L2_AMR_RAD_STATIC_CALIBRATION-AMR_Side_1-acc_lat')
+
+    # Search via name
+    >>> api.name('/AMR_Side_1/acc_lat')
+
+    # Search via concept_id
+    >>> api.concept_id('V2112019824-POCLOUD')
+
 As an alternative to chaining methods together to set the parameters of your query, a method exists to allow you to pass your parameters as keyword arguments:
@@ -158,0 +179,0 @@

setup.py

@@ -5,3 +5,3 @@ from setuptools import setup
     name="python-cmr",
-    version="0.5.0",
+    version="0.6.0",
     license="MIT",
@@ -8,0 +8,0 @@ url="https://github.com/nasa/python_cmr",

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

51100

4.56%

Lines of code

657

1.55%