Skip to content

Commit

Permalink
Merge pull request #273 from podaac/release/2.11.0
Browse files Browse the repository at this point in the history
Release 2.11.0
  • Loading branch information
jamesfwood authored Aug 13, 2024
2 parents 0b11e55 + 5f668f0 commit 34d6c4b
Show file tree
Hide file tree
Showing 18 changed files with 1,033 additions and 1,003 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
poetry run flake8 podaac
- name: Test and coverage
run: |
poetry run pytest --junitxml=build/reports/pytest.xml --cov=podaac/ --cov-report=xml:build/reports/coverage.xml -m "not aws and not integration" tests/
poetry run pytest -n auto --junitxml=build/reports/pytest.xml --cov=podaac/ --cov-report=xml:build/reports/coverage.xml -m "not aws and not integration" tests/
- name: SonarCloud Scan
id: sonarcloud
uses: sonarsource/sonarcloud-github-action@master
Expand Down Expand Up @@ -201,6 +201,7 @@ jobs:
poetry run sphinx-build -b html ./docs docs/_build/
- name: Publish Docs
uses: JamesIves/github-pages-deploy-action@v4
if: ${{ github.actor != 'dependabot[bot]' }}
with:
branch: gh-pages # The branch the action should deploy to.
folder: docs/_build/ # The folder the action should deploy.
Expand Down Expand Up @@ -294,3 +295,15 @@ jobs:
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
git tag -a "${{ env.software_version }}" -m "Version ${{ env.software_version }}"
git push origin "${{ env.software_version }}"
- name: Deploy Harmony
env:
ENV: ${{ env.venue }}
CMR_USER: ${{ secrets.CMR_USER }}
CMR_PASS: ${{ secrets.CMR_PASS }}
if: |
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release')
working-directory: deployment
run:
poetry run python harmony_deploy.py --tag ${{ env.software_version }}
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security


## [2.11.0]
### Added
- [issue/267](https://github.com/podaac/l2ss-py/pull/261): Add xtrack and atrack dimension options for get_nd_indexers when bounding box subsetting is performed on SNDR.
- Fix temporal subsetting ghrsst dataset by adding time delta to time variable.
- Add a function to test ghrsst dataset ability to access variables when mask_and_scale is true.
- Update l2ss-py to allow the return of empty granules.
### Changed
### Deprecated
### Removed
- Removed old cmr association files, Dockerfile, and cmr updater script
### Fixed
### Security


## [2.10.0]
### Added
- [issue/260](https://github.com/podaac/l2ss-py/pull/261): Add gpm cleanup function to add a timeMidScan variable if the timeMidScan variable isn't present. Function takes the years, months, days etc ScanTime variables and creates a single time variable using datetime.datetime library.
### Changed
- Update code to determin lat lon time variables
- Update code to determine lat lon time variables
- Update xarray version
- [pull/248](https://github.com/podaac/l2ss-py/pull/248): add Harmony extra_args.cut parameter to subset_params in service adapter
### Deprecated
Expand Down
7 changes: 2 additions & 5 deletions cmr/Readme.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
### UMM-S Update
This directory holds files for updating the service's CMR UMM-S profile.

Core files for CMR UMM-S update and associations are:
* cmr.Dockerfile (for running the script via Jenkins)
* run_umms_updater.sh (for executing the command line request)
* cmr_umms_s.json (UMM-S profile to keep updated locally)
* associations.txt (list of concept_ids, one per line, to be associated with UMM-S)
Core files for CMR UMM-S update are:
* l2ss_cmr_umm_s.json (UMM-S profile to keep updated)
40 changes: 0 additions & 40 deletions cmr/cmr.Dockerfile

This file was deleted.

90 changes: 0 additions & 90 deletions cmr/ops_associations.txt

This file was deleted.

35 changes: 0 additions & 35 deletions cmr/run_umms_updater.sh

This file was deleted.

93 changes: 0 additions & 93 deletions cmr/uat_associations.txt

This file was deleted.

Loading

0 comments on commit 34d6c4b

Please sign in to comment.