Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to main for v1.1.0 #2

Merged
merged 52 commits into from
Jun 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
82befe4
ummg updates
pgbrodrick Jan 21, 2022
6a29a4b
bug fixes, ummg working now
Jan 21, 2022
e30efe8
Merge pull request #6 from emit-sds/ummg
Jan 21, 2022
7f15dfe
changes to ummg based on daac upload attempt results
pgbrodrick Jan 27, 2022
dc7b4e4
move datetime conversion to with the ummg initialization
pgbrodrick Jan 27, 2022
dab52bf
spatial extent format update
pgbrodrick Jan 27, 2022
003655a
update data granule metadata
pgbrodrick Jan 27, 2022
86d8a51
add daynight flag
pgbrodrick Jan 27, 2022
0aeff2d
Update README.md
Jan 28, 2022
3334001
Update README.md
Jan 28, 2022
ab412fb
Update README.md
Jan 28, 2022
58c553e
Update README.md
Jan 28, 2022
121e7e3
add license file
pgbrodrick Jan 28, 2022
c761072
remove list outer layer for ummg spatial domain
pgbrodrick Jan 28, 2022
ece1e4c
Merge branch 'develop' of github.jpl.nasa.gov:emit-sds/emit-utils int…
pgbrodrick Jan 28, 2022
88aa674
Resolve conflict
winstonolson Jan 31, 2022
7d7d404
Change setup version to 0.4.0
winstonolson Jan 31, 2022
aa75861
Update changelog for v0.4.0
winstonolson Jan 31, 2022
b469551
break out metadata specs for easy att use
pgbrodrick Feb 8, 2022
7a47a2a
Increment version to 1.0.0
winstonolson Feb 9, 2022
cd3058b
Update changelog
winstonolson Feb 9, 2022
c34c775
remove ipdb
Apr 1, 2022
df67dd6
updates for geospatial info from glts
pgbrodrick Apr 1, 2022
bc6f0e1
Merge branch 'develop' of github.jpl.nasa.gov:emit-sds/emit-utils int…
pgbrodrick Apr 1, 2022
6a7861f
nc fpa dims nomenclature update
pgbrodrick Apr 1, 2022
25523ab
lingering scan references
pgbrodrick Apr 1, 2022
82f590d
add glt compression
pgbrodrick Apr 1, 2022
2dfc286
notes for to-dos and some updates
pgbrodrick May 12, 2022
daf7e43
change add_data_file_ummg to plural, accept multiple files as list
pgbrodrick May 12, 2022
6f4d222
extend data file addition to allow different file formats
pgbrodrick May 12, 2022
a46dbcc
add general related urls, and function to support adding additional ones
pgbrodrick May 12, 2022
ff35157
add software build version to ummg init
pgbrodrick May 12, 2022
e1d40df
add software build version to ummg init doc
pgbrodrick May 12, 2022
7fd64c6
update ummg init to include PGEVersionClass
pgbrodrick May 12, 2022
6bc4b13
split name and version int independent entries
pgbrodrick May 12, 2022
5d9f855
update related urls function to have optional subtype and make descri…
pgbrodrick May 12, 2022
9da1baa
add cloud percentage check
pgbrodrick May 12, 2022
5a994af
add ug, atbd, and cloud cover to ummg init
pgbrodrick May 12, 2022
4679230
make cloud fraction optional
pgbrodrick May 12, 2022
7fd81a5
updated todos
pgbrodrick May 12, 2022
ec352ab
Merge pull request #1 from emit-sds/ummg_updates
winstonolson May 29, 2022
4271612
Fix add_related_url
winstonolson May 29, 2022
78f91b9
bugfix to return cloud fraction as rounded int (percentage)
pgbrodrick May 29, 2022
50c4586
Make platforms and insruments lists. Fix PGE key names.
winstonolson Jun 1, 2022
4bef218
Use ProviderDate type 'Update' - this field is required for ingest
winstonolson Jun 1, 2022
f3f6802
Switch ProviderDates type back to 'Insert' since it seems to be requi…
winstonolson Jun 1, 2022
d3710f1
Tweak instrument name per DAAC to 'EMIT Imaging Spectrometer'
winstonolson Jun 1, 2022
283e6f6
Tweak comment
winstonolson Jun 1, 2022
3a6c1ea
Convert cloud_fraction to int for ummg
winstonolson Jun 2, 2022
75e2124
update cloud_fraction syntax error
Jun 6, 2022
873afbc
Update version to 1.1.0
winstonolson Jun 6, 2022
23a56f5
Update change log
winstonolson Jun 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 45 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,59 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v0.3.0](https://github.jpl.nasa.gov/emit-sds/emit-utils/compare/v0.2.0...v0.3.0)
#### [v1.1.0](https://github.com/emit-sds/emit-utils/compare/v1.0.0...v1.1.0)

> 29 December 2021
> 6 June 2022

- Daac interface [`#4`](https://github.jpl.nasa.gov/emit-sds/emit-utils/pull/4)
- Netcdf [`#3`](https://github.jpl.nasa.gov/emit-sds/emit-utils/pull/3)
- adds netcdf converter basics, still needs a few updates [`36e4a58`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/36e4a58dce35d88b3ffafb217d9243e39ed5b1ec)
- Add requirements to setup file based on import statements. Add calc_checksum function that defaults to sha512 checksum, but can be augmented to include others. [`30677d8`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/30677d8cf8bdda89f32cb23252826e95c100a72d)
- update elevation naming, add day/night checker [`bf99a31`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/bf99a317184f79e6cc3478b04375177c757ce4b1)
- Ummg updates [`#1`](https://github.com/emit-sds/emit-utils/pull/1)
- change add_data_file_ummg to plural, accept multiple files as list [`daf7e43`](https://github.com/emit-sds/emit-utils/commit/daf7e437b6e2c265f907152b32edc9fd862f153b)
- notes for to-dos and some updates [`2dfc286`](https://github.com/emit-sds/emit-utils/commit/2dfc286c0cafb38daf404d295c1c0845d6cd2641)
- add general related urls, and function to support adding additional ones [`a46dbcc`](https://github.com/emit-sds/emit-utils/commit/a46dbccd207a837182a258079adf81c4a2123552)

#### [v0.2.0](https://github.jpl.nasa.gov/emit-sds/emit-utils/compare/v0.1.0...v0.2.0)
### [v1.0.0](https://github.com/emit-sds/emit-utils/compare/v0.4.0...v1.0.0)

> 9 February 2022

- Merge develop to main for 1.0.0 [`#8`](https://github.com/emit-sds/emit-utils/pull/8)
- break out metadata specs for easy att use [`b469551`](https://github.com/emit-sds/emit-utils/commit/b4695512a9276bf79f6e1435fb59e66c547f320e)
- Update changelog [`cd3058b`](https://github.com/emit-sds/emit-utils/commit/cd3058bbc12754a0e34f928d92bd67f53bf06f70)
- Increment version to 1.0.0 [`7a47a2a`](https://github.com/emit-sds/emit-utils/commit/7a47a2a93405fe3c4e9a2bc06aa4a1aac4dd84c1)

#### [v0.4.0](https://github.com/emit-sds/emit-utils/compare/v0.3.0...v0.4.0)

> 31 January 2022

- Merge develop into main for v0.4.0 [`#7`](https://github.com/emit-sds/emit-utils/pull/7)
- Ummg file creation [`#6`](https://github.com/emit-sds/emit-utils/pull/6)
- Update changelog for v0.4.0 [`aa75861`](https://github.com/emit-sds/emit-utils/commit/aa75861c7daf8e3c4fb9a22327355a38aacd9e7b)
- Change setup version to 0.4.0 [`7d7d404`](https://github.com/emit-sds/emit-utils/commit/7d7d404a3e5a9ba622354aac1adb606474412e67)
- Resolve conflict [`88aa674`](https://github.com/emit-sds/emit-utils/commit/88aa674c2adce357a61cae0a2e9fcf505f12e9d2)

#### [v0.3.0](https://github.com/emit-sds/emit-utils/compare/v0.2.0...v0.3.0)

> 20 January 2022

- Merge develop for release 0.3.0 [`#5`](https://github.com/emit-sds/emit-utils/pull/5)
- Daac interface [`#4`](https://github.com/emit-sds/emit-utils/pull/4)
- Netcdf [`#3`](https://github.com/emit-sds/emit-utils/pull/3)
- adds netcdf converter basics, still needs a few updates [`36e4a58`](https://github.com/emit-sds/emit-utils/commit/36e4a58dce35d88b3ffafb217d9243e39ed5b1ec)
- Add changelog [`5d4f786`](https://github.com/emit-sds/emit-utils/commit/5d4f786868c3b3dcb5bdd78a932ef95b63177c9c)
- Add requirements to setup file based on import statements. Add calc_checksum function that defaults to sha512 checksum, but can be augmented to include others. [`30677d8`](https://github.com/emit-sds/emit-utils/commit/30677d8cf8bdda89f32cb23252826e95c100a72d)

#### [v0.2.0](https://github.com/emit-sds/emit-utils/compare/v0.1.0...v0.2.0)

> 25 October 2021

- Merge develop for version 0.2.0. [`#2`](https://github.jpl.nasa.gov/emit-sds/emit-utils/pull/2)
- update gdal imports, add safe envi header reference [`b3b9f66`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/b3b9f663e23ebbebc8e6b183f9bd90c3a20639f5)
- Increment version to 0.2.0 [`3a5859f`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/3a5859fac439dfc8bc968b1e072535b69861843f)
- Update readme. [`ca6b5af`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/ca6b5af3df2229cd78b6dba2885fc38b496a7604)
- Merge develop for version 0.2.0. [`#2`](https://github.com/emit-sds/emit-utils/pull/2)
- update gdal imports, add safe envi header reference [`b3b9f66`](https://github.com/emit-sds/emit-utils/commit/b3b9f663e23ebbebc8e6b183f9bd90c3a20639f5)
- Increment version to 0.2.0 [`3a5859f`](https://github.com/emit-sds/emit-utils/commit/3a5859fac439dfc8bc968b1e072535b69861843f)
- Update readme. [`ca6b5af`](https://github.com/emit-sds/emit-utils/commit/ca6b5af3df2229cd78b6dba2885fc38b496a7604)

#### v0.1.0

> 26 January 2021

- Merge develop to main for v0.1.0 release [`#1`](https://github.jpl.nasa.gov/emit-sds/emit-utils/pull/1)
- added install file, basic file checking, started multi-raster functions [`5fd1b47`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/5fd1b4784a21cc948be410565ca5e525dfbf0c7f)
- add igm map space lookups [`f5f2250`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/f5f2250a9ab6faa3bba44718f3d13509b84a9439)
- input type changes to file checks for ease, extra multi-raster info return options [`707d038`](https://github.jpl.nasa.gov/emit-sds/emit-utils/commit/707d03868cb1b5ad0473350a268a158577cee20c)
- Merge develop to main for v0.1.0 release [`#1`](https://github.com/emit-sds/emit-utils/pull/1)
- added install file, basic file checking, started multi-raster functions [`5fd1b47`](https://github.com/emit-sds/emit-utils/commit/5fd1b4784a21cc948be410565ca5e525dfbf0c7f)
- add igm map space lookups [`f5f2250`](https://github.com/emit-sds/emit-utils/commit/f5f2250a9ab6faa3bba44718f3d13509b84a9439)
- input type changes to file checks for ease, extra multi-raster info return options [`707d038`](https://github.com/emit-sds/emit-utils/commit/707d03868cb1b5ad0473350a268a158577cee20c)
201 changes: 201 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# emit-utils
<h1 align="center">emit-utils</h1>

Welcome to the EMIT utils science data system repository. To understand how this repository is linked to the rest of the emit-sds repositories, please see [the repository guide](https://github.jpl.nasa.gov/emit-sds/emit-main/wiki/Repository-Guide).
NOTE - at this time the EMIT repositories are not supporting Pull Requests from members outside of the EMIT-SDS Team. This is expected to change in March, and guidance on branches will be provided at that time. At present, public migration of this repository is a work-in-progress, and not all features are yet fully up to date. See the **develop** branch - set as default - for the latest code._

Welcome to the EMIT utils science data system repository. To understand how this repository is linked to the rest of the emit-sds repositories, please see [the repository guide](https://github.com/emit-sds/emit-main/wiki/Repository-Guide).

The emit utils repository provides general convenience utilities used broadly throughout the emit-sds. This repository can be installed locally by:

```
git clone [email protected]:emit-sds/emit-utils.git
pip install --editable [email protected]:emit-sds/emit-utils.git
```
Loading