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

Fix cotsoc noncontrib #571

Merged
merged 7 commits into from Jan 6, 2017
Merged

Fix cotsoc noncontrib #571

merged 7 commits into from Jan 6, 2017

Conversation

cbenz
Copy link
Member

@cbenz cbenz commented Sep 19, 2016

From #570

@@ -1,5 +1,10 @@
# Changelog

## 4.1.12

* Rename cotsoc_noncontrib to cotisations_non_contributives
Copy link
Member

Choose a reason for hiding this comment

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

You should also do that with cotsoc_contrib etc.
Look for all these badly named cotosoc_* ;-)

Copy link
Member Author

Choose a reason for hiding this comment

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

So this will be a larger pull request, but OK

Copy link
Member Author

Choose a reason for hiding this comment

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

There are only cotsoc_bar_declarant1 and cotsoc_lib_declarant1 remaining. How should I rename them?

@benjello
Copy link
Member

benjello commented Sep 20, 2016

I will deal with those !
Open a issue and assign it to me.
Thanks !

@cbenz
Copy link
Member Author

cbenz commented Sep 22, 2016

@benjello OK but since the renames lead to a Major Bump (4.1.11 => 5.0.0) I prefer keeping this PR opened and let you take your time to add commits in the branch of the PR (fix-cotsoc-noncontrib).

Then we'll merge it.

@cbenz cbenz assigned benjello and unassigned cbenz Sep 22, 2016
@benjello benjello requested a review from fpagnoux January 5, 2017 10:58
@benjello
Copy link
Member

benjello commented Jan 5, 2017

@fpagnoux : i need to merge this one ASAP too ;-)

@fpagnoux
Copy link
Member

fpagnoux commented Jan 5, 2017

Good for me, but we had recently a lot of major releases for just a few renamings. I would prefer if they were grouped in one PR.

But maybe I'm being to attached to version number, @MattiSG your thoughts ?

@benjello
Copy link
Member

benjello commented Jan 5, 2017

Should we wait for MattiSG to merge this ?
BTW, cotsoc_noncontrib is not much used downstream (mainly by IPP) so I am ok either way !

@benjello
Copy link
Member

benjello commented Jan 6, 2017

@MattiSG @fpagnoux : I do not want to let this PR rot ;-)

@MattiSG
Copy link
Member

MattiSG commented Jan 6, 2017

Don't be romantic about versioning. It's nice to bundle changes, but don't do it at the cost of delaying delivery. As long as the changelog is clear, the clients can adapt their own update pace and do several versions at once.

@MattiSG
Copy link
Member

MattiSG commented Jan 6, 2017

If we plan a bit more, we'll make these changes more meaningful.

@benjello benjello merged commit 971e9fa into master Jan 6, 2017
@benjello benjello deleted the fix-cotsoc-noncontrib branch January 6, 2017 16:01
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

4 participants