Skip to content

Merge master into features #6594

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

Merged
merged 23 commits into from
Jan 28, 2020

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Jan 28, 2020

No description provided.

blueyed and others added 23 commits January 23, 2020 11:57
Starting with wheel 0.32.0 (2018-09-29), the `license_file` option is deprecated.

* https://wheel.readthedocs.io/en/stable/news.html

The wheel will continue to include `LICENSE`, it is now included automatically:

* https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file

And `LICENSE` is still included in sdists thanks to setuptools-scm:

* pytest-dev#6348 (comment)
…rder

tests: add test_plugin_loading_order
…file-metadata

Remove deprecated license_file from setup.cfg
This is implemented by the underlying stream already, which additionally
checks if the stream is not closed, and calls `write` per line.

Ref/via: pytest-dev#6558 (comment)
While it might not help with the following, it certainly might happen as
well.

```
+ curl -S -L --connect-timeout 5 --retry 6 -s https://codecov.io/bash -o codecov-upload.sh
curl: (16) Error in the HTTP2 framing layer
```
…nnrefused

ci: codecov: use `--retry-connrefused` with curl
…ollect_only_live_logging

tests: test_collection_collect_only_live_logging: allow for 1+s
@blueyed blueyed merged commit 1586653 into pytest-dev:features Jan 28, 2020
@blueyed blueyed deleted the merge-master-into-features branch January 28, 2020 13:44
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.

3 participants