Skip to content

[12.0][MIG] auth_ldaps - #42

Merged
pedrobaeza merged 3 commits into
OCA:12.0from
brainbeanapps:12.0-mig-auth_ldaps
Oct 25, 2018
Merged

pedrobaeza merged 3 commits into
OCA:12.0from
brainbeanapps:12.0-mig-auth_ldaps

Conversation

@alexey-pelykh

Copy link
Copy Markdown

No description provided.

@oca-clabot

Copy link
Copy Markdown

Hey @alexey-pelykh, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

@pedrobaeza pedrobaeza added this to the 12.0 milestone Oct 16, 2018
@pedrobaeza

pedrobaeza commented Oct 16, 2018

Copy link
Copy Markdown
Member

Thanks for the contribution!

runbot warnings:

2018-10-16 06:26:51,079 150 WARNING openerp_test odoo.models: The model res.company.ldap has no _description

Have you signed the CLA?

@alexey-pelykh

Copy link
Copy Markdown
Author

re: CLA - yes, just email one.
re: warnings - not sure what to add there as original model does not specify any

@pedrobaeza

Copy link
Copy Markdown
Member

Well, you can add the description on your inherited model.

@alexey-pelykh alexey-pelykh mentioned this pull request Oct 16, 2018
19 tasks
@alexey-pelykh

Copy link
Copy Markdown
Author

I'm not sure that adding a description in inherited model is a good approach, since eventually original model may get one. Is there a strict requirement of having that description in inherited model?

@pedrobaeza

Copy link
Copy Markdown
Member

This is for avoiding the warning on the runbot, so the CIs are green, so it's mandatory on that way. Now you have also Travis red.

@alexey-pelykh

Copy link
Copy Markdown
Author

Yeah, lint :) Fixed both issues, hopefully would work now

@alexey-pelykh

Copy link
Copy Markdown
Author

@pedrobaeza I've added the description yet it still fails for some reason, a hint would be much appreciated

@alexey-pelykh alexey-pelykh changed the title 12.0 mig auth ldaps [12.0][MIG] auth_ldaps Oct 17, 2018
@alexey-pelykh

Copy link
Copy Markdown
Author

Strictly speaking, I don't see a _description for this case here, please advise

@pedrobaeza

Copy link
Copy Markdown
Member

Hi @alexey-pelykh, it turns out that the trick of putting the description in the inherited model doesn't server for avoiding the warning, so here the only solution is to ignore the warning and tell Odoo to fix it in the core (or make a PR fixing it).

@alexey-pelykh

Copy link
Copy Markdown
Author

Got it. Are there any other changes needed for this PR to be accepted?

@pedrobaeza

Copy link
Copy Markdown
Member

Well, now this one should be technically and functionally reviewed (mine was only "kick-off review"). Check review guidelines in https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md#review

If you want to speed up your PR, you can review other PRs and ask in exchange that they review yours.

@alexey-pelykh

Copy link
Copy Markdown
Author

Thanks for the hint! Just to make sure I've understood you correctly, now the ball is on OCA side and I should just wait?

@pedrobaeza

Copy link
Copy Markdown
Member

No, that's not what I mean. It's not on the OCA side, but on contributors side, and also on your side. If you want your PR to be reviewed, you should do the same on other PRs. That's how collaborative efforts work!

Comment thread auth_ldaps/models/res_company_ldap.py Outdated
# Copyright (C) 2018 Brainbean Apps
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

import ldap

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There was an issue regarding this import: #37
Can you fix it by protecting the import?

try:
    import ldap
except (ImportError) as err:
    _logger.debug(err)

https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md#importerror

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

And put it in a separate commit (no squash) to backport it easily on 11.0.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Even if it's a mandatory dependency of the "parent" module?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done

@lmignon lmignon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you @alexey-pelykh fot this work.
A little comment. (Code review only)

Comment thread auth_ldaps/__manifest__.py

@lmignon lmignon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM Code review only

@alexey-pelykh

Copy link
Copy Markdown
Author

Next step on my side is to wait, right?

@alexey-pelykh

Copy link
Copy Markdown
Author

Runbot warnings are going to be present until odoo/odoo#28047 is merged

@alexey-pelykh

Copy link
Copy Markdown
Author

@pedrobaeza all green and 5 days seems to have passed, what should I do next?

@pedrobaeza

Copy link
Copy Markdown
Member

Please squash your 3 migration commits in one following https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests and I'll merge.

@alexey-pelykh

Copy link
Copy Markdown
Author

But there was a specific request to make those 2 changes separately by @lmignon and @sebalix to backport those to 10.0 and 11.0

@pedrobaeza

Copy link
Copy Markdown
Member

@lmignon and I have different notion of commits. I'm more commit saving as they don't usually express so much being split (although there are of course exceptions), but he seems to collect commits 😋

I think you should at least squash last 2 as they are about the same thing and will be cherry-picked together, but I let you the final word.

@alexey-pelykh

Copy link
Copy Markdown
Author

Sounds reasonable! Done

@pedrobaeza
pedrobaeza merged commit b17784c into OCA:12.0 Oct 25, 2018
@alexey-pelykh
alexey-pelykh deleted the 12.0-mig-auth_ldaps branch October 25, 2018 21:08
@lmignon

lmignon commented Oct 26, 2018

Copy link
Copy Markdown
Contributor

@pedrobaeza In this specific case merging the two last commit makes senss

@alexey-pelykh

Copy link
Copy Markdown
Author

@pedrobaeza do these modules get released to pypi.org?

@pedrobaeza

Copy link
Copy Markdown
Member

It should through our bots, but I'm not too aware of the process. I'm seeing the setup directory in https://github.com/OCA/server-auth/tree/11.0/setup/auth_ldaps, but I can't say if everything is OK. @lmignon or @sbidoul can say about that.

@sbidoul

sbidoul commented Oct 28, 2018

Copy link
Copy Markdown
Member

@alexey-pelykh

Copy link
Copy Markdown
Author

Thanks! For some reason, search did not bring it up

@alexey-pelykh

Copy link
Copy Markdown
Author

And to https://apps.odoo.com/apps as well?

@sbidoul

sbidoul commented Oct 28, 2018

Copy link
Copy Markdown
Member

Ah that's another story. Someone has to manually add the 200 or so 12.0 branches on apps.odoo.com... I don't think that has been done yet.

@oca-clabot

Copy link
Copy Markdown

Hey @alexey-pelykh,
We acknowledge that the following users have signed our Contributor License Agreement:

Appreciation of efforts,
OCA CLAbot

SiesslPhillip pushed a commit to grueneerde/OCA-server-auth that referenced this pull request Nov 20, 2024
Syncing from upstream OCA/server-auth (9.0)
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.

7 participants