Skip to content

Resolve conflicts #111

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.

Sign up for GitHub

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

Merged
grallewellyn merged 3 commits into from
Feb 26, 2025
Merged

Resolve conflicts #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fdf235
Release/4.1.0 (#106)
marjo-luc Sep 12, 2024
1c5d61c
/version 4.1.0
marjo-luc Sep 12, 2024
8c682ff
resolved merge conflicts
grallewellyn Feb 26, 2025
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security

## [4.1.0]
### Added
- [feature/secrets](https://github.com/MAAP-Project/Community/issues/1048): Added support for user secrets management
- [feature/jobs-list-query](https://github.com/MAAP-Project/maap-api-nasa/issues/130): Added query filter parameters to listJobs endpoint
- [issues/95](https://github.com/MAAP-Project/maap-py/issues/95): Added CICD pipeline
- [feature/pagination](https://github.com/MAAP-Project/Community/issues/1027): Added pagination support for listJobs endpoint

### Changed
- [community-909](https://github.com/MAAP-Project/Community/issues/909): Removed need to track maap.cfg

## [4.0.1]
### Added
- [issues/95](https://github.com/MAAP-Project/maap-py/issues/95): Added github action workflow for publishing and switched to poetry for builds
Expand Down
3 changes: 2 additions & 1 deletion maap/maap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import json
import logging
import boto3
Expand Down Expand Up @@ -412,4 +413,4 @@ def show(self, granule, display_config={}):


if __name__ == "__main__":
print("initialized")
print("initialized")