Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/nasa/harmony-py into harmon…
Browse files Browse the repository at this point in the history
…y-1414
  • Loading branch information
ygliuvt committed Oct 31, 2023
2 parents c96936d + 854522e commit cec5210
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
File renamed without changes.
11 changes: 2 additions & 9 deletions examples/intro_tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,9 @@
"\n",
"First we import packages needed to request and visualize our data, as well as the `harmony-py` library itself. Make sure to install `harmony-py` and its dependencies into your current Python environment prior to executing the notebook:\n",
"\n",
"``` \n",
"$ pip install -U harmony-py \n",
"\n",
"```\n",
"\n",
"You can install this and any other necessary libraries directly into your Jupyter notebook Python kernel as well:\n",
"\n",
"```\n",
"!{sys.executable} -m pip install -U harmony-py\n",
"````\n"
"pip install -U harmony-py\n",
"```"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion harmony/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Automatically updated by `make build`
__version__ = "0.4.9"
__version__ = "0.4.10"

from harmony.config import Environment
from harmony.harmony import BBox, Client, Collection, LinkType, Dimension
Expand Down
5 changes: 5 additions & 0 deletions harmony/harmony.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ class Request(BaseRequest):
dimensions: A list of dimensions to use for subsetting the data
extend: A list of dimensions to extend
crs: reproject the output coverage to the given CRS. Recognizes CRS types that can be
inferred by gdal, including EPSG codes, Proj4 strings, and OGC URLs
(http://www.opengis.net/def/crs/...)
Expand Down Expand Up @@ -267,6 +269,7 @@ def __init__(self,
spatial: BBox = None,
temporal: Mapping[str, datetime] = None,
dimensions: List[Dimension] = None,
extend: List[str] = None,
crs: str = None,
destination_url: str = None,
format: str = None,
Expand All @@ -290,6 +293,7 @@ def __init__(self,
self.spatial = spatial
self.temporal = temporal
self.dimensions = dimensions
self.extend = extend
self.crs = crs
self.destination_url = destination_url
self.format = format
Expand Down Expand Up @@ -325,6 +329,7 @@ def __init__(self,
'skip_preview': 'skipPreview',
'ignore_errors': 'ignoreErrors',
'grid': 'grid',
'extend': 'extend'
}

self.spatial_validations = [
Expand Down
2 changes: 2 additions & 0 deletions tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,8 @@ def test_post_request_has_user_agent_headers(examples_dir):
({'width': 100}, 'width=100'),
({'concatenate': True}, 'concatenate=true'),
({'grid': 'theGridName'}, 'grid=theGridName'),
({'extend': ['lat', 'lon']}, 'extend=lat&extend=lon'),
({'extend': ['singleDimension']}, 'extend=singleDimension'),
])

@responses.activate
Expand Down

0 comments on commit cec5210

Please sign in to comment.