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

Feat: django 4.2 support #123

Merged
merged 16 commits into from
Aug 11, 2023
Merged

Conversation

mogoh
Copy link
Contributor

@mogoh mogoh commented Jul 18, 2023

Description

I just wanted to create a pull request for discussing progress.
Even though I am at an OK level of using git, I am not that familiar with github specific pull requests.
So, if I understood that correctly, I can still rebase the branch before merging.

This pull request is for issue #122 .

Related resources

Checklist

  • I have opened this pull request against master
  • I have added or modified the tests when changing logic
  • I have followed the conventional commits guidelines to add meaningful information into the changelog
  • I have read the contribution guidelines and I have joined #workgroup-pr-review on
    Slack to find a “pr review buddy” who is going to review my pull request.

@mogoh mogoh mentioned this pull request Jul 18, 2023
11 tasks
@mogoh
Copy link
Contributor Author

mogoh commented Jul 18, 2023

BTW: If it is considered bad, to open a pull request for this instead of integrating the changes into the existing pull request #120 , we can gladly close this one. But I don't know how to append commits to a foreign pull request.

@marksweb
Copy link
Member

@mogoh while you've got an open PR it just shows what's happening on your branch here. You can rebase your branch and keep making changes. They'll all just show up here.

If the branch isn't ready yet, you can also have draft PRs. This gives people visibility of what you're doing but let's them know it's not ready to merge yet.

@mogoh mogoh marked this pull request as draft July 19, 2023 09:46
@mogoh
Copy link
Contributor Author

mogoh commented Jul 19, 2023

@marksweb I did not know about draft pull requests, and now I changed this one into a draft. Thanks.

@mogoh mogoh force-pushed the feat-django-4-2-support branch 3 times, most recently from ec48b45 to 31e5eef Compare July 24, 2023 14:10
Using latest cms migration as a dependency.

Co-authored-by: Vašek Chalupníček <[email protected]>
Co-authored-by: Mark Walker <[email protected]>
@mogoh mogoh force-pushed the feat-django-4-2-support branch from 31e5eef to aa86407 Compare July 25, 2023 09:27
@mogoh mogoh force-pushed the feat-django-4-2-support branch from aa86407 to f4f7811 Compare July 26, 2023 13:35
@mogoh mogoh changed the title Feat: django 4 2 support Feat: django 4.2 support Aug 2, 2023
@mogoh mogoh force-pushed the feat-django-4-2-support branch 2 times, most recently from 436783e to 2baa8c6 Compare August 10, 2023 13:48
@mogoh mogoh force-pushed the feat-django-4-2-support branch from 2baa8c6 to c917c21 Compare August 10, 2023 14:45
@mogoh mogoh marked this pull request as ready for review August 10, 2023 14:46
@mogoh
Copy link
Contributor Author

mogoh commented Aug 10, 2023

This pull request is now ready for review.
Please be aware that I relax coverage requirements down to 95%, in the hopes, that this is an acceptable value.

Copy link
Member

@marksweb marksweb left a comment

Choose a reason for hiding this comment

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

This looks excellent @mogoh, thank you.

Just 1 minor thing on pyupgrade I've suggested.

.pre-commit-config.yaml Outdated Show resolved Hide resolved
Python version on par with supported versions.

Co-authored-by: Mark Walker <[email protected]>
@mogoh mogoh requested a review from marksweb August 11, 2023 09:18
@mogoh
Copy link
Contributor Author

mogoh commented Aug 11, 2023

I guess I missed something.
Where should I increase the version number?
I have changed the CHANGELOG.rst but haven't changed djangocms_picture/__init__.py.
Should I just increase the version number to 4.1.0 and be good?

@marksweb
Copy link
Member

@mogoh Don't worry about changing version. We have dedicated PRs to handle the version change, and the release process for this needs updating so I can do that as it needs changes on pypi as well if I've not set it up already.

@marksweb
Copy link
Member

@mogoh I should add to that, we usually reserve a header in changelogs for "unreleased" that you can then add the PR changes to, and once there are changes ready for a release, all unreleased changes get moved to a heading and date for the new version that's getting released.

Some projects use a tool called bump2version which largely automates the version change process. I might integrate this here as well.

@marksweb marksweb merged commit ad66a84 into django-cms:master Aug 11, 2023
@mogoh mogoh deleted the feat-django-4-2-support branch August 11, 2023 13:36
gruy pushed a commit to gruy/djangocms-picture that referenced this pull request Dec 2, 2023
* feat: Add migrations for Django 4.2

Using latest cms migration as a dependency.

Co-authored-by: Vašek Chalupníček <[email protected]>
Co-authored-by: Mark Walker <[email protected]>

* build: update setup.py classifiers

* test: add script to autogenerate requirements

* test: rename base.txt into requirements.in and add some changes

* test: delete old test requirements

* test: autogenerate requirements

* ci: add pyproject.toml

* ci: Update tox.ini

use ruff instead of flake8 and isort

* ci: linting on push / pull_reqest now uses ruff instead of flake8 and isort

* ci: add .pre-commit-config.yaml

* ci: add lint-pr.yml

* ci: update test.yml

* fix: sort imports

* docs: update CHANGELOG.rst

* ci: relax coverage requirements down to 95%

* ci: Update .pre-commit-config.yaml

Python version on par with supported versions.

Co-authored-by: Mark Walker <[email protected]>

---------

Co-authored-by: Vašek Chalupníček <[email protected]>
Co-authored-by: Mark Walker <[email protected]>
Co-authored-by: Leonhard Küper <[email protected]>
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.

3 participants