Skip to content

merge dev into Feature/2231 transforms#2640

Merged
rijobro merged 6 commits intoProject-MONAI:feature/2231-transformsfrom
wyli:feature/2231-transforms
Jul 22, 2021
Merged

merge dev into Feature/2231 transforms#2640
rijobro merged 6 commits intoProject-MONAI:feature/2231-transformsfrom
wyli:feature/2231-transforms

Conversation

@wyli
Copy link
Copy Markdown
Contributor

@wyli wyli commented Jul 21, 2021

Hi @rijobro this tries to resolve the merging conflicts feature/2231-transforms => dev introduced by #2631

Status

Ready

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).
  • Breaking change (fix or new feature that would cause existing functionality to change).
  • New tests added to cover the changes.
  • Integration tests passed locally by running ./runtests.sh -f -u --net --coverage.
  • Quick tests passed locally by running ./runtests.sh --quick --unittests.
  • In-line docstrings updated.
  • Documentation updated, tested make html command in the docs/ folder.

wyli and others added 5 commits July 21, 2021 11:20
* adds look_up_options

Signed-off-by: Wenqi Li <[email protected]>

* adds docstring example

Signed-off-by: Wenqi Li <[email protected]>

* fixes tests

Signed-off-by: Wenqi Li <[email protected]>

* update enum look ups

Signed-off-by: Wenqi Li <[email protected]>

* fixes typos

Signed-off-by: Wenqi Li <[email protected]>

* update based on comments

Signed-off-by: Wenqi Li <[email protected]>
Signed-off-by: Wenqi Li <[email protected]>
@wyli wyli requested a review from rijobro July 21, 2021 16:00
@rijobro rijobro force-pushed the feature/2231-transforms branch from 613e453 to 87264a2 Compare July 21, 2021 16:00
@rijobro
Copy link
Copy Markdown
Contributor

rijobro commented Jul 21, 2021

Thanks! Unfortunately I force pushed to the PR, which has messed this up slightly. Any ideas? If not I'll go through manually.

@wyli
Copy link
Copy Markdown
Contributor Author

wyli commented Jul 21, 2021

nually.

no problem, let me update this pull request...

@madil90
Copy link
Copy Markdown
Contributor

madil90 commented Jul 21, 2021

/build

@rijobro rijobro merged commit 37da23e into Project-MONAI:feature/2231-transforms Jul 22, 2021
@rijobro
Copy link
Copy Markdown
Contributor

rijobro commented Jul 22, 2021

Thanks!

@wyli wyli deleted the feature/2231-transforms branch July 22, 2021 09:45
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.

4 participants