Skip to content

Commit

Permalink
pin rasterio and fiona (ECCC-MSC#321)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomkralidis authored Mar 7, 2024
1 parent c2869f6 commit f99cbd1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions msc_pygeoapi/provider/msc_dms.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def get_fields(self):
elif isinstance(v, dict):
type_ = 'object'

fields_[k] = {'type': type_}
fields_[k] = {'type': type_, 'title': k}
fields_ = dict(sorted(fields_.items()))

return fields_
Expand Down Expand Up @@ -401,9 +401,7 @@ def __init__(self, provider_def):
MSCDMSCoreAPIProvider.__init__(self, provider_def)

def get_fields(self):
new_fields = {
'field': []
}
new_fields = {}

fields_ = MSCDMSCoreAPIProvider.get_fields(self)

Expand All @@ -412,6 +410,7 @@ def get_fields(self):
continue

uom = None
units = None
unit_field = f'{key}-uom'

if unit_field in fields_:
Expand All @@ -426,6 +425,8 @@ def get_fields(self):
field_def = {
'id': key,
'name': key,
'title': key,
'x-ogc-unit': units,
'type': 'Quantity',
'encodingInfo': {
'dataType': f"http://www.opengis.net/def/dataType/OGC/0/{value['type']}" # noqa
Expand All @@ -435,7 +436,7 @@ def get_fields(self):
if uom is not None:
field_def['uom'] = uom

new_fields['field'].append(field_def)
new_fields[key] = field_def

return new_fields

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
click
elasticsearch>=8,<9
fiona
fiona<1.10
gdal
lxml
netcdf4
Expand All @@ -10,7 +10,7 @@ pygeometa
pyproj<3.5
python-slugify
pyyaml
rasterio
rasterio<1.4
requests
sqlalchemy
unicodecsv
Expand Down

0 comments on commit f99cbd1

Please sign in to comment.