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

Merge main to dev #20

Merged
merged 18 commits into from
Jul 11, 2023
Merged

Merge main to dev #20

merged 18 commits into from
Jul 11, 2023

Conversation

greglucas
Copy link
Collaborator

Our dev branch is behind main, so we should merge main into dev so we get back on the same page with pull requests.

tech3371 and others added 18 commits June 16, 2023 13:43
MNT: Adding more pre-commit hooks
updates:
- [github.com/pre-commit/pre-commit-hooks: v2.3.0 → v4.4.0](pre-commit/pre-commit-hooks@v2.3.0...v4.4.0)
- [github.com/psf/black: 22.12.0 → 23.3.0](psf/black@22.12.0...23.3.0)
- [github.com/charliermarsh/ruff-pre-commit: v0.0.245 → v0.0.276](astral-sh/ruff-pre-commit@v0.0.245...v0.0.276)
- [github.com/python-poetry/poetry: 1.4.0 → 1.5.0](python-poetry/poetry@1.4.0...1.5.0)
…-ci-update-config

[pre-commit.ci] pre-commit autoupdate
Copy link
Contributor

@tech3371 tech3371 left a comment

Choose a reason for hiding this comment

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

I was just mentioning that to Gabriel because we couldn't find some things on dev branch. Thank you for doing this!

@greglucas greglucas merged commit f235f2e into dev Jul 11, 2023
@greglucas
Copy link
Collaborator Author

Merging just to get this back in order.

@bourque
Copy link
Collaborator

bourque commented Aug 7, 2023

@all-contributors please add @tech3371 for review

@allcontributors
Copy link
Contributor

@bourque

I've put up a pull request to add @tech3371! 🎉

laspsandoval pushed a commit to laspsandoval/imap_processing that referenced this pull request Nov 15, 2023
…e-Operations-Center/main

Merge main to dev
@bourque bourque deleted the main branch February 7, 2024 21:52
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