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

[pre-commit.ci] pre-commit autoupdate #260

Merged
merged 1 commit into from
Sep 8, 2022

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Sep 5, 2022

updates:
- [github.com/psf/black: 22.6.0 → 22.8.0](psf/black@22.6.0...22.8.0)
@codecov
Copy link

codecov bot commented Sep 5, 2022

Codecov Report

Merging #260 (2319ab1) into main (b825cea) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #260   +/-   ##
=======================================
  Coverage   95.54%   95.54%           
=======================================
  Files          10       10           
  Lines        3634     3634           
  Branches      773      773           
=======================================
  Hits         3472     3472           
  Misses        110      110           
  Partials       52       52           
Flag Coverage Δ
unittests 95.54% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Collaborator

@ThomasHaine ThomasHaine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ready to go.

@ThomasHaine ThomasHaine merged commit 4d64eb1 into main Sep 8, 2022
@ThomasHaine ThomasHaine deleted the pre-commit-ci-update-config branch September 8, 2022 19:55
Mikejmnez pushed a commit to Mikejmnez/oceanspy that referenced this pull request Sep 13, 2022
updates:
- [github.com/psf/black: 22.6.0 → 22.8.0](psf/black@22.6.0...22.8.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Mikejmnez added a commit that referenced this pull request Oct 24, 2022
* fixes typo

* stablishes common practice of update mates after each manipulation

* update intake catalog to define correctly location of Yp1 and Xp1

* point to my own catalog entry

* change grid paramrs to ECCO dataset too

* point to dev branch catalog for testing

* add function that calculates edge of values on arctic triangles

* set XRange and YRange as arguments

* import rel_lon

* def .self aprop

* add ref_lon=180 as set value

* import get_maskH

* add masking fn to compute edges

* add fn to compute edges of data in arctic caps

* add entry arguments consistent with new functionality

* [pre-commit.ci] pre-commit autoupdate (#260)

updates:
- [github.com/psf/black: 22.6.0 → 22.8.0](psf/black@22.6.0...22.8.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Bump mamba-org/provision-with-micromamba from 12 to 13 (#259)

Bumps [mamba-org/provision-with-micromamba](https://github.com/mamba-org/provision-with-micromamba) from 12 to 13.
- [Release notes](https://github.com/mamba-org/provision-with-micromamba/releases)
- [Commits](mamba-org/provision-with-micromamba@v12...v13)

---
updated-dependencies:
- dependency-name: mamba-org/provision-with-micromamba
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* set default arctic_crown

* fix typo

* do not need get_maskH

* fix bug

* remove code that is not ready

* fixed bug

* fixed typos

* fixed typo

* pass dim as an argument

* persist only after masking, and if opt

* fix bug after rebasing

* reverse sign of u

* remove code to make compatible changes on flip_v

* transpose only if combining data with different layouts

* style

* reorder axis so that in each facet, x increases with lon and y increases with lat - does not change the data layout

* follows style convention

* set facets to same dims in y

* transpose only x and y

* follows style guides

* fix bug

* persist

* mask at corner points lat and lon

* determines edge of data on a face

* slices dataset removing nans

* correct numpy reference

* mask both `YC` and `YG`

* remove unnecessary argument

* add `add_Hbdr` as argument to pass

* faces when cutout ranges are given

* assert face appears as a dimension

* estimate the dimensions of the arctic cut

* pass dims of corner lats

* slice datasets

* fix typo in string

* import get_maskH

* moved get_hmask to utils to I can import it in llcrearrange without errors

* remove old import

* correct reference to local function

* correct reference to faces list of each facet

* necessary changes for code to be compatible with new additions to rearrange

* test faces vals

* print warning

* style fixes

* fixed style

* print var

* removed b/c was failing to eval True

* remove print - checked it is working

* shift in y to correct for staggered grids

* fix bug and style

* add thicker hbdr for ECCO

* allow centering as input, but otherwise try to better estimate it

* fix bug

* fix some style

* correct indetation

* WOCE stations for testing

* fix the conditional on `faces`

* import new functions into testing

* style

* remove unnecesary code

* remove space

* add ref lon as an argument into `mask_var` - when range is across discontinuity

* add ref_lon as an argument

* pass ref_lon into llc_rearrange

* add corrected coords for P04

* reformatted

* 2nd correction to P04

* formatting

* correct order of P14 section

* formatting

* reverse orientation of I06

* reformatting

* fixed bug - allow var for be defined anywhere in the staggered grid

* load into memory the dataarray -single face- to speed up

* pass entire mooring array

* pass entire survey array

* min and max are retained when masking

* redefine rel_lon to allow non-linear longitudes within XRange

* write tests for rel_lon

* fix indentation

* fix bug - test pass

* re define fn

* import correct name

* _rel_lon

* array a list

* update reset

* fix bug - reset_range works for single discontinuity crossing

* make it work for change in sign, no discontinuity, array

* fix bug

* XRange already has the right format

* import numpy into test_utils

* remuve faces as arg from subsample, improve checks on ranges

* use correct function

* rel_lon is not needed

* add automated way to recenter at Pacific ocean

* add test for arc_connect with cuts

* crate the range, instead of take values from dataarray which may be decresing

* move reset to only apply when `face` a dimension

* fix some tests

* move rest only when face is a dimensions - only there is it a problem

* remove tests for cutout with transformation

* allow decreasing XRange consisting of a list of end points, which decreases but does not go across a discontinuity

* fix bug - jump in absolute value

* no need to apply get_maskH before cutout. Needs to be applied after. reset must always be done, to ensure XRange increases

* def ref_lon when XRange is None

* fix errors and comment untested functions

* no need to state anythin about XRange/YRange if None

* allow XRange None to pass

* Allow XRange and YRange Nones

* pass XRange and YRange as arguments

* fixed typo

* add integers

* fixed buggy typo

* revert to sample from dim values

* apply shift only when YRange is None

* when just combining faces, shift the rotated Facet in their corner points

* only persist when cutout when YRange is None

* only persist when both XRange and YRange are not None

* shift differently

* remove for testing

* fix bug, but shift might be wrong. testing

* correct shift>?

* only slice dataset when XRange and YRange are given. When `None` transform all the dataset - only with ECCO!

* add print

* move faces is None earlier in the code

* .

* fixed test according to new version of code

* removed print - not needed anymore

* introduce new variable for masking and leave original unmasked

* add test on horizontal dimensions

* use copy lat to mask and evaluate.

* drop copy of YG

* remove nYC copy - not needed

* add correct lengths to tests

* include `_var_` into varlist

* _var_ only a var if XRange and YRange given

* remove test with arctic data for now

* make sure XRange and YRange are arrays

* testing

* fixed bug on tests

* added XRange YRange from WOCE sections

* fixed bug!!!!

* added WOCE sections

* extended version of P01

* style

* remove unused faces

* test case

* testing for cuts

* fixed by adding Hbdr=2

* style

* testing with A01

* format

* more tests

* style

* add test with VarList=`None`

* allow `varList=None`, also replaced varlist with varList

* replace varlist with varList, and added test for varList=None

* add test with varList=None

* fixed bug-pass varList

* format style

* changed fn, comment tests for now

* changes to include the arctic cap

* removed commented old version of fn

* only shift if their same number of points at center and corner points

* shift dims of final dataset to always begin at 0

* restore drop to what it was. If done dims drop separately, causes fail in test

* shift long at corner points if arctic data exchanging with face 10

* test for arctic with face 2

* fix bug - select actual dataset

* tests with arctic data

* correct expected results

* removed unnecesary arguments

* tests for slicing datasets - no arctic yet

* testing!

* replace with actual value

* fixed set up error, included more tests!

* formatting style

* test, approaching the pole

* updating fork to changes into main

* shift dataset to zero in both dimensions

* fix value, only shift if dims are positives

* fix tests

* revert to slice

* transpose when data in first facet - even if only data within these facets

* transposed expected test values

* only shift is there is data across facets

* didn`t resolved issue with transforming dataset

* fixed tests

* resolve conflict hopefully?

* fix correct `hainegroup` directory  - other is for testing changes to intake catalog

* remove test_path

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Miguel Jimenez <mjimen17@jhu.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant