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

Port CHANGELOG from 4.6.6 release #5952

Merged
merged 1 commit into from
Oct 13, 2019

Conversation

nicoddemus
Copy link
Member

No description provided.

Copy link
Member

@asottile asottile left a comment

Choose a reason for hiding this comment

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

@asottile asottile merged commit a20880c into pytest-dev:master Oct 13, 2019
@nicoddemus nicoddemus deleted the port-changelog branch October 13, 2019 17:22
@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

Shouldn't we merge the tag instead?
#5523 shows up 3 times in the changelog now.

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

I think the changelog for 4.6 should not go into master / 5.x at all, no?

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

As for #5523 in particular: it shows up with 5.0.1 and 5.1.0, probably because master was not merged into features before doing the release?

@asottile
Copy link
Member

yes we should include the 4.6 changelog, otherwise it does not appear in the docs

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

blueyed added a commit to blueyed/pytest that referenced this pull request Oct 14, 2019
@asottile
Copy link
Member

yes but nobody is going to land on that

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

If you are using 4.x you should look at the docs for it, no?

@asottile
Copy link
Member

should? perhaps -- but I don't expect anyone to be able to find anything except latest from google, etc.

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

Well, it might actually help Google etc if we would mention 4.6.x not within 5.x docs.

Apart from that, is googling for pytest changes/changelogs a common / valid use case after all?
(IMHO I think that is rather distracting to land on the changelog when you're interested in actual docs, but that's more an issue of (too verbose) changelogs in general - but it does not help to duplicate items there then additionally)

What about a clear note at the top that changes for 4.6.x are somewhere else? (with the above link)

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

Also people using 5.x (the common use case) have to skip 4.6 entries when looking at the changelog.

@asottile
Copy link
Member

the 4.6 changelog entries are already below 5.x ones, not sure how anyone would mistake the two

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

I've not said that they could be mistaken.

@The-Compiler
Copy link
Member

FWIW pylint does this (only having changelog in branches) and (at least when I followed its development a while back) it was a frequent source of confusion. IMHO, the changelog in the "main" docs should contain all versions.

@blueyed
Copy link
Contributor

blueyed commented Oct 14, 2019

@The-Compiler
Any references? (I've tried to find something via https://github.com/PyCQA/pylint/issues?q=is%3Aissue+changelog+is%3Aclosed only quickly, but could not)

There's no such thing as "main" docs really.
I can see that the docs default to "latest", but then it should be made more clear (apart from the RTD version selector) maybe, that you are looking at docs for 5.x.

It makes sense to merge the current release branch into the development branch before doing a new major release (as we are doing with master => features before a new release from there in general), but here we have two separate release branches really (5.x (master), and 4.6.x (4.6-maintenance)).
Having to copy/add changelogs manually (instead of through a merge) is clearly an indicator that this might be wrong, isn't it?

MarcoGorelli pushed a commit to MarcoGorelli/pytest that referenced this pull request Oct 18, 2019
MarcoGorelli pushed a commit to MarcoGorelli/pytest that referenced this pull request Oct 18, 2019
Add link to technical aspects issue to the py27-py34 docs

Update pdb++ link (moved to GitHub)

Add pudb to project examples

Casting fixture parameter to list at the beginning of parameter parsing.

Added changelog file.

Fixed linting.

Always creating list for consistency.

Co-Authored-By: Bruno Oliveira <[email protected]>

Workaround curl bug which makes retries of fetching codecov.io/bash not work

Port CHANGELOG from 4.6.6 release

changelog: pytest-dev#5523 was fixed in 5.0.1 already

Ref: pytest-dev#5952 (comment)

doc: caplog: add caplog.messages

Add missing version added/changed markers to docs

Notice some features since 5.0 were not being properly
marked in which version they have been added/changed.

tests: keep numpy being optional

Ref: pytest-dev#5950 (comment)

ci: Travis: move py37-pexpect to another job

It does not have to run all tests again by itself.

Remove redundant mention from 5.2.0 release notes.

Fix plurality mismatch for 'warnings' and 'error' in terminal summary

Make sure plurality match is respected in rest of codebase

Fix collection message

Add changelog entry

Update tests

Change keys so by default they're plural and rename _match_plurality to _make_plural

Fix rebase

Fix rebase

Fix rebase
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.

4 participants