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 into v3 #1203

Merged
merged 30 commits into from
Sep 26, 2024
Merged

Conversation

medihack
Copy link
Member

@medihack medihack commented Sep 25, 2024

Pull main into v3, solve conflicts. Also, updated dependencies.

Successful PR Checklist:

  • Tests
    • (not applicable?)
  • Documentation
    • (not applicable?)

PR label(s):

Sorry, something went wrong.

renovate bot and others added 30 commits September 7, 2024 01:40
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
…vate/all

chore(deps): update all dependencies
…vate/major-all

chore(deps): update all dependencies (major)
for more information, see https://pre-commit.ci
…vate/all

chore(deps): update all dependencies
for more information, see https://pre-commit.ci
…vate/lock-file-maintenance

chore(deps): lock file maintenance
…tion_django
…_return_type
for more information, see https://pre-commit.ci
…vate/all

chore(deps): update all dependencies
for more information, see https://pre-commit.ci
…vate/lock-file-maintenance

chore(deps): lock file maintenance
…-optional

Make docs dependencies non optional again
@medihack medihack requested a review from a team as a code owner September 25, 2024 23:29
Copy link

Coverage report

Click to see where and how coverage changed

FileStatementsMissingCoverageCoverage
(new stmts)
Lines missing
  procrastinate
  blueprints.py
  periodic.py
  tasks.py
Project Total  

This report was generated by python-coverage-comment-action

@ewjoachim
Copy link
Member

Were there still conflicts after my last pass ? Nothing too complex I hope ?

@medihack
Copy link
Member Author

Were there still conflicts after my last pass ? Nothing too complex I hope ?

Nope, minor. I struggled more with the .pre-commit-config.yml constantly got overridden (for one hour or so 😂). But then, at some point, I realized how poetry-to-pre-commit works 😉.

@ewjoachim
Copy link
Member

Oh wow, sorry for the time loss ! Do you think we should write about that in CONTRIBUTING.md ?

@ewjoachim ewjoachim merged commit 663962a into procrastinate-org:v3 Sep 26, 2024
13 checks passed
@medihack
Copy link
Member Author

Oh wow, sorry for the time loss ! Do you think we should write about that in CONTRIBUTING.md ?

It's not too bad. As a result, I learned a bit about pre-commit, which also benefits my other projects. I can add a little hint to the docs, on the other hand we can't document everything.

@ewjoachim ewjoachim mentioned this pull request Sep 26, 2024
10 tasks
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.

None yet

3 participants