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

Add Titanium membership variant, remove prepopulation of membership benefits #2382

Merged
merged 4 commits into from
Apr 17, 2023

Conversation

elichad
Copy link
Contributor

@elichad elichad commented Apr 14, 2023

Fixes #2368, fixes #2100.

Pins black to 22.x (matching our precommit/lint jobs) to avoid some reformatting elsewhere in workshops/views.py that happens under black 23.x.

Copy link
Contributor

@pbanaszkiewicz pbanaszkiewicz left a comment

Choose a reason for hiding this comment

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

Please bring unpinned black. Otherwise the changes look good.

Pipfile Outdated
@@ -48,7 +48,7 @@ requests-mock = "~=1.9.3"
tblib = "~=1.7.0"
flake8 = "*"
mypy = "*"
black = "*"
black = "~=22.12.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think I'd rather have black unpinned and allow it to reformat some files now.

Plus I don't think you should be seeing reformatting applied to workshops/views.py since this file is not touched by your changes and would not trigger pre-commit hook.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wrote the wrong name 🤦 it was reformatting workshops/models.py. As I've reverted it and not made further changes to that file, the formatting won't change now anyway.

Perhaps we should bump our CI linting, pre-commit file etc. to use black 23.x and reformat the whole repo accordingly once we have v4.1 ready to go?

Copy link
Contributor

Choose a reason for hiding this comment

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

@elichad

Perhaps we should bump our CI linting, pre-commit file etc. to use black 23.x and reformat the whole repo accordingly once we have v4.1 ready to go?

That's a good idea.

@pbanaszkiewicz pbanaszkiewicz added this to the v4.1 milestone Apr 16, 2023
@elichad elichad merged commit 9a6b747 into develop Apr 17, 2023
@elichad elichad deleted the feature/2368-Add-Titanium-membership-variant branch April 17, 2023 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add "Titanium" membership variant Remove auto-fill of membership benefits
2 participants