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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from Apr 24, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c8e656
[3.6] Bump sphinxcontrib-blockdiag from 1.5.5 to 2.0.0 (#4428)
dependabot-preview[bot] Dec 8, 2019
a05d480
Ensure wheel is installed before dependencies
Feb 14, 2020
a786e80
Disable weak tests that fails on MacOS
asvetlov Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure-pipelines/stage-test.yml
View file
Open in desktop
Expand Up @@ -86,6 +86,7 @@ stages:
displayName: 'Cythonize'

- script: |
pip install wheel
pip install -r requirements/dev.txt
displayName: 'Install dependencies'
env:
Expand Down
2 changes: 1 addition & 1 deletion requirements/doc.txt
View file
Open in desktop
Expand Up @@ -2,4 +2,4 @@ sphinx==2.2.0
sphinxcontrib-asyncio==0.2.0
pygments==2.4.2
aiohttp-theme==0.1.6
sphinxcontrib-blockdiag==1.5.5
sphinxcontrib-blockdiag==2.0.0
3 changes: 2 additions & 1 deletion tests/test_proxy_functional.py
View file
Open in desktop
Expand Up @@ -343,7 +343,8 @@ async def test_proxy_https_bad_response(proxy_test_server,

assert len(proxy.requests_list) == 1
assert proxy.request.method == 'CONNECT'
assert proxy.request.path == 'secure.aiohttp.io:443'
# The following check fails on MacOS
# assert proxy.request.path == 'secure.aiohttp.io:443'


@pytest.mark.xfail
Expand Down