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

Release branch 2.15.1 #7393

Conversation

Pierre-Sassoulas
Copy link
Member

No description provided.

@Pierre-Sassoulas Pierre-Sassoulas added Maintenance Discussion or action around maintaining pylint or the dev workflow Skip news 🔇 This change does not require a changelog entry labels Sep 1, 2022
@Pierre-Sassoulas Pierre-Sassoulas added this to the 2.15.1 milestone Sep 1, 2022
towncrier.toml Outdated
Comment on lines 2 to 4
version = "2.16.0"
version = "2.15.1"
directory = "doc/whatsnew/fragments"
filename = "doc/whatsnew/2/2.16/index.rst"
filename = "doc/whatsnew/2/2.15/index.rst"
Copy link
Member Author

Choose a reason for hiding this comment

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

This is going to NOT be a merge conflict and we need to be careful when merging in main.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I was wondering about this. Do we need to bump to the dev version on main? What's the benefit? Can't we just bump when we need to for a release?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well it's useful to know the pylint version we're talking about (2.16.0-dev0 vs 2.15.1). scm_setuptool was nice for this but created a dependencie we did not want...

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah I mean I don't really mind, but referring to main would also work for me.
It reduces the amount of work necessary for a release so I thought it might be something to consider.

Copy link
Member Author

Choose a reason for hiding this comment

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

referring to main ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

As in, I never use 2.16.0-dev0 directly in any of my messages. I often just say main or something like that. There is not much benefit for me to having the bumped version, but that might just be me.

Copy link
Collaborator

@DanielNoord DanielNoord left a comment

Choose a reason for hiding this comment

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

Release notes seem to be broken...

@Pierre-Sassoulas
Copy link
Member Author

Release notes seem to be broken...

Yes, I was wondering what to do. Maybe use "False positive for 2.15.1" as title ? Maybe remove the titles altogether... ?

@Pierre-Sassoulas
Copy link
Member Author

We have titles that are duplicated when we generate the patch release note:

/home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst:63: WARNING: duplicate label whatsnew/2/2.15/index:false positives fixed, other instance in /home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst
/home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst:132: WARNING: duplicate label whatsnew/2/2.15/index:other bug fixes, other instance in /home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst

@DudeNr33 do you have an opinion about the easy way to fix this ?

@DanielNoord
Copy link
Collaborator

We have titles that are duplicated when we generate the patch release note:

/home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst:63: WARNING: duplicate label whatsnew/2/2.15/index:false positives fixed, other instance in /home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst
/home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst:132: WARNING: duplicate label whatsnew/2/2.15/index:other bug fixes, other instance in /home/runner/work/pylint/pylint/doc/whatsnew/2/2.15/index.rst

@DudeNr33 do you have an opinion about the easy way to fix this ?

Can we fix this by decreasing the title level? I haven't tested this, but can we have duplicate titles if they fall within different top level titles?

@DudeNr33
Copy link
Collaborator

DudeNr33 commented Sep 1, 2022

I'm currently on vacation and probably won't have time to try around myself until next Monday, sorry!
The underlines that are used by towncrier can be configured via the underlines option (see the readme).

I am a bit surprised that this is an issue, as I would expect others to experience this as well, but I did not find any issue about this in their issue tracker.
Is this maybe just because we include a :toctree:?
In this case decreasing the title level could work, but then again the toctree would be useless anyway and we could also just remove that instead of changing the title level.

mbyrnepr2 and others added 8 commits September 6, 2022 22:15
…l is assigned to a class attribute inside the class where the function is defined. (pylint-dev#7395)

Closes pylint-dev#6592
Previously pylint would lint a file passed on stdin even if the user
meant to ignore the file. This commit fixes that issue.

Co-authored-by: Daniël van Noord <13665637+DanielNoord@users.noreply.github.com>
… annotations (pylint-dev#7400)

Don't emit 'unused-variable' or 'unused-import' on names in string literal type annotations (pylint-dev#3299)
Don't treat strings inside typing.Literal as names
@Pierre-Sassoulas
Copy link
Member Author

I'm going to fix the release note manually to be able to release until we discuss what we should do. Not sure what to do with #7398, it's in 2.16.0 but it's labelled "need backport", what do you think @DanielNoord ?

@DanielNoord
Copy link
Collaborator

I thought it would be good to backport as there were other PRs that target that code.

If there are regression it would be helpful to have the refactor available on the maintenance branch as well.

* Fix and refactors for ``docparams`` extension

The ``re_only_desc`` regex did not match for white and characters after
``\n``, so some description-only lines weren't getting matched. In
addition, lookaheads were added to ``re_param_line`` (i.e. make sure the
type group is not followed by a new line (``\n``)). Lastly, named groups
(ala Perl regular expressions) were added for slightly improved clarity.

Co-authored-by: Hendry, Adam <adam.grant.hendry@gmail.com>
@Pierre-Sassoulas
Copy link
Member Author

Alright, I moved it to 2.15.1 and cherry-picked it :) I think we can release now

DanielNoord
DanielNoord previously approved these changes Sep 6, 2022
@DanielNoord DanielNoord dismissed their stale review September 6, 2022 21:14

Saw some files

@DanielNoord
Copy link
Collaborator

btw, for future reviews I think we should split up the back port and release PRs. Stuff like the broken towncrier files are difficult to spot in larger PRs like this.

For now it is fine though! 😄

@Pierre-Sassoulas
Copy link
Member Author

Forgot to regenerate the towncrier file after adding 3 more cherry-pick, my bad.

@Pierre-Sassoulas Pierre-Sassoulas merged commit c5aefa2 into pylint-dev:maintenance/2.15.x Sep 6, 2022
@Pierre-Sassoulas Pierre-Sassoulas deleted the release-branch-2.15.1 branch September 6, 2022 21:34
- Fix ignored files being linted when passed on stdin.

Closes #4354 (`#4354 <https://github.com/PyCQA/pylint/issues/4354>`_)
- ``missing-return-doc``, ``missing-raises-doc`` and ``missing-yields-doc`` now respect
Copy link
Collaborator

Choose a reason for hiding this comment

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

Doesn't towncrier know about white spaces? 😅

Copy link
Member Author

Choose a reason for hiding this comment

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

I manually removed the duplicated titles, which is why there might be some problems.

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's fix in #7426

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance Discussion or action around maintaining pylint or the dev workflow Skip news 🔇 This change does not require a changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants