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

[3.6] Bump sphinxcontrib-blockdiag from 1.5.5 to 2.0.0 (#4428) #4576

Merged
merged 3 commits into from Apr 24, 2020

Conversation

TBBle
Copy link

@TBBle TBBle commented Feb 14, 2020

(cherry picked from commit bbea369)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Needed to fix CI builds for this branch due to transitive dependency drift, see #4570 (comment)

(cherry picked from commit bbea369)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@asvetlov
Copy link
Member

Codecov Report

Merging #4576 into 3.6 will decrease coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##              3.6    #4576      +/-   ##
==========================================
- Coverage   97.96%   97.88%   -0.08%     
==========================================
  Files          44       44              
  Lines        8886     8886              
  Branches     1392     1392              
==========================================
- Hits         8705     8698       -7     
- Misses         72       75       +3     
- Partials      109      113       +4     
Impacted Files Coverage Δ
aiohttp/pytest_plugin.py 95.51% <0.00%> (-1.93%) ⬇️
aiohttp/helpers.py 95.27% <0.00%> (-1.25%) ⬇️
aiohttp/web_fileresponse.py 98.29% <0.00%> (+0.56%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0dbf937...1c8e656. Read the comment docs.

@codecov-io
Copy link

codecov-io commented Feb 14, 2020

Codecov Report

Merging #4576 into 3.6 will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##              3.6    #4576      +/-   ##
==========================================
- Coverage   97.96%   97.92%   -0.04%     
==========================================
  Files          44       44              
  Lines        8886     8886              
  Branches     1392     1392              
==========================================
- Hits         8705     8702       -3     
- Misses         72       74       +2     
- Partials      109      110       +1
Impacted Files Coverage Δ
aiohttp/pytest_plugin.py 95.51% <0%> (-1.93%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0dbf937...a786e80. Read the comment docs.

@TBBle
Copy link
Author

TBBle commented Feb 14, 2020

The Codecov decreases are all around code for Python 3.7. I'm pretty sure that's because the Python 3.7 CI tests all failed due to something about brotlipy, e.g., https://dev.azure.com/aio-libs/aiohttp/_build/results?buildId=2400&view=logs&jobId=0e1435bb-9b02-56e8-f42e-850ecf5364f5&j=0e1435bb-9b02-56e8-f42e-850ecf5364f5&t=04072f5d-ea3c-53d7-c4d2-75ecd591d50d.

This might be another transitive bit-rot issue, since this branch hasn't passed CI since October 2019, and the logs for those CI runs have expired.

Perhaps backporting #3803 would help, but that hasn't been done for 3.7 either, so it's probably not the right action.

Perhaps the Python 3.7 platform doesn't have wheel installed, and we've been lucky before now? https://dev.azure.com/aio-libs/aiohttp/_build/results?buildId=2400&view=logs&j=0e1435bb-9b02-56e8-f42e-850ecf5364f5&t=04072f5d-ea3c-53d7-c4d2-75ecd591d50d&l=56 suggests that installing wheel in the same run doesn't make it available to later packages.

Right now, brotlipy is trying to run `bdist_wheel`, which fails if wheel is not installed.

Observed on the Azure Python 3.7 CI test runner.
@TBBle
Copy link
Author

TBBle commented Feb 14, 2020

Okay, now the Python 3.7 tests are failing, which is progress.

================================== FAILURES ===================================
____________________ test_proxy_https_bad_response[pyloop] ____________________

proxy_test_server = <function proxy_test_server.<locals>.proxy_server at 0x0000027C16760A68>
get_request = <function get_request.<locals>._request at 0x0000027C16ACEB88>

    async def test_proxy_https_bad_response(proxy_test_server,
                                            get_request) -> None:
        url = 'https://secure.aiohttp.io/path'
        proxy = await proxy_test_server()
        proxy.return_value = dict(
            status=502,
            headers={'Proxy-Agent': 'TestProxy'})
    
        with pytest.raises(aiohttp.ClientHttpProxyError):
            await get_request(url=url, proxy=proxy.url)
    
        assert len(proxy.requests_list) == 1
        assert proxy.request.method == 'CONNECT'
>       assert proxy.request.path == 'secure.aiohttp.io:443'
E       AssertionError: assert '443' == 'secure.aiohttp.io:443'
E         - 443
E         + secure.aiohttp.io:443

tests\test_proxy_functional.py:346: AssertionError

(cherry picked from commit 2ef9911)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
@TBBle
Copy link
Author

TBBle commented Feb 14, 2020

The failing test was disabled on master in 2ef9911, with the same failure on MacOS that I'm now seeing on all the Python 3.7 builds. So cherry-picking that commit too.

@TBBle
Copy link
Author

TBBle commented Mar 6, 2020

@asvetlov: Ping? I don't know why code-cov claims a fall in coverage, it suggests the various proactor_loop tests are not being run on Windows with Python 3.7, but the logs show at least one passing.

@webknjaz webknjaz merged commit 1c302e9 into aio-libs:3.6 Apr 24, 2020
@TBBle TBBle deleted the backport-bbea369-3.6 branch July 1, 2020 01:30
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