Skip to content

Commit

Permalink
CI: Fix i686 manylinux build (#4021)
Browse files Browse the repository at this point in the history
  • Loading branch information
mjpieters authored and asvetlov committed Aug 31, 2019
1 parent 3d5b794 commit 512432c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
4 changes: 2 additions & 2 deletions requirements/ci-wheel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ pytest==5.1.2
pytest-cov==2.7.1
pytest-mock==1.10.4
tox==3.13.2
trustme==0.5.2
cryptography==2.7
twine==1.13.0
typing_extensions==3.7.4
yarl==1.3.0

# Using PEP 508 env markers to control dependency on runtimes:
aiodns==2.0.0; platform_system!="Windows" # required c-ares will not build on windows
cryptography==2.7; platform_machine!="i686" # no 32-bit wheels
trustme==0.5.2; platform_machine!="i686" # no 32-bit wheels
codecov==2.0.15
uvloop==0.12.1; platform_system!="Windows" and implementation_name=="cpython" and python_version<"3.7" # MagicStack/uvloop#14
idna-ssl==1.1.0; python_version<"3.7"
9 changes: 8 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
from uuid import uuid4

import pytest
import trustme

try:
import trustme
TRUSTME = True
except ImportError:
TRUSTME = False

pytest_plugins = ['aiohttp.pytest_plugin', 'pytester']

Expand All @@ -25,6 +30,8 @@

@pytest.fixture
def tls_certificate_authority():
if not TRUSTME:
pytest.xfail("trustme fails on 32bit Linux")
return trustme.CA()


Expand Down

0 comments on commit 512432c

Please sign in to comment.