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

[AUTO-MERGE] Merge main into develop via merge-main-to-develop #3280

Merged
merged 7 commits into from
Nov 8, 2023

Conversation

idanov
Copy link
Member

@idanov idanov commented Nov 7, 2023

A new change in main cannot be merged into develop as part of the regular sync job, hence this PR. Please resolve the conflicts manually, and make sure to obtain 2 approvals once the builds pass.

IMPORTANT NOTICE

Please let CircleCI merge this PR automatically, with merge commit enabled.

deepyaman and others added 4 commits November 4, 2023 12:31
* build: format code with `ruff format` over `black`

Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>

* style(ruff-format): format code with `ruff format`

Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>

---------

Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>
Signed-off-by: Ajay Gonepuri <ajaygonepuri@gmail.com>
Co-authored-by: Jo Stichbury <jo_stichbury@mckinsey.com>
* Update create_a_pipeline.md

typo: 
--nodes=preprocess_shuttles_node needs to be specified

Signed-off-by: Pranav Dave <75449103+pdave34@users.noreply.github.com>

* Use both node names

Signed-off-by: Juan Luis Cano Rodríguez <hello@juanlu.space>

* Update create_a_pipeline.md

Signed-off-by: Jo Stichbury <jo_stichbury@mckinsey.com>

---------

Signed-off-by: Pranav Dave <75449103+pdave34@users.noreply.github.com>
Signed-off-by: Juan Luis Cano Rodríguez <hello@juanlu.space>
Signed-off-by: Jo Stichbury <jo_stichbury@mckinsey.com>
Co-authored-by: Juan Luis Cano Rodríguez <hello@juanlu.space>
Co-authored-by: Jo Stichbury <jo_stichbury@mckinsey.com>
* Replace a `StopIteration` exception with for-else 

Signed-off-by: Nok Lam Chan <nok.lam.chan@quantumblack.com>

* fix the logic

Signed-off-by: Nok <nok.lam.chan@quantumblack.com>

* bug fix

Signed-off-by: Nok <nok.lam.chan@quantumblack.com>

---------

Signed-off-by: Nok Lam Chan <nok.lam.chan@quantumblack.com>
Signed-off-by: Nok <nok.lam.chan@quantumblack.com>
Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>
Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>
Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>
@deepyaman deepyaman enabled auto-merge (squash) November 7, 2023 22:37
@noklam noklam self-requested a review November 8, 2023 04:29
@noklam
Copy link
Contributor

noklam commented Nov 8, 2023

Thank you!

@deepyaman deepyaman merged commit d5e6a00 into develop Nov 8, 2023
54 of 58 checks passed
@deepyaman deepyaman deleted the merge-main-to-develop branch November 8, 2023 04:30
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.

5 participants