From 50a91b1a72ae7c00e51e9ed9bdb02f6672d02934 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Aug 2019 13:52:03 +0300
Subject: [PATCH] Release 3.6.0a9

---
 aiohttp/__init__.py       |  2 +-
 requirements/ci-wheel.txt |  4 ++--
 tests/conftest.py         | 10 ++++++----
 tools/build-wheels.sh     |  4 +---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index 9851e3623ed..e3a26889869 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '3.6.0a8'
+__version__ = '3.6.0a9'
 
 from typing import Tuple  # noqa
 
diff --git a/requirements/ci-wheel.txt b/requirements/ci-wheel.txt
index b656c7c94f1..cdc6c87135d 100644
--- a/requirements/ci-wheel.txt
+++ b/requirements/ci-wheel.txt
@@ -12,8 +12,8 @@ pytest==5.1.1
 pytest-cov==2.7.1
 pytest-mock==1.10.4
 tox==3.13.2
-trustme==0.5.2
-cryptography==2.7
+trustme==0.5.2; platform_machine=="x86_64" or python_version>"3.5"
+cryptography==2.7; platform_machine=="x86_64" or python_version>"3.5"
 twine==1.13.0
 yarl==1.3.0
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 45fff76ed8c..3de97df374f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,13 +1,16 @@
 import hashlib
 import pathlib
-import platform
 import shutil
 import ssl
 import tempfile
 import uuid
 
 import pytest
-import trustme
+try:
+    import trustme
+    TRUSTME = True
+except ImportError:
+    TRUSTME = False
 
 pytest_plugins = ['aiohttp.pytest_plugin', 'pytester']
 
@@ -24,8 +27,7 @@ def shorttmpdir():
 
 @pytest.fixture
 def tls_certificate_authority():
-    if (platform.system() == 'Linux' and
-            platform.architecture() == ('32bit', 'ELF')):
+    if not TRUSTME:
         pytest.xfail("trustme fails on 32bit Linux")
     return trustme.CA()
 
diff --git a/tools/build-wheels.sh b/tools/build-wheels.sh
index 0d368ef07fa..97ba31def01 100755
--- a/tools/build-wheels.sh
+++ b/tools/build-wheels.sh
@@ -18,7 +18,7 @@ ORIG_WHEEL_DIR="${BUILD_DIR}/original-wheelhouse"
 SRC_DIR="${BUILD_DIR}/src"
 WHEELHOUSE_DIR="${WORKDIR_PATH}/dist"
 
-set -xeuo pipefail
+set -euo pipefail
 # ref: https://coderwall.com/p/fkfaqq/safer-bash-scripts-with-set-euxo-pipefail
 
 PYTHON_VERSIONS="cp35-cp35m cp36-cp36m cp37-cp37m"
@@ -82,8 +82,6 @@ for PYTHON in ${PYTHON_VERSIONS}; do
 
     echo
     echo -n "Test $PYTHON: "
-    yum install -y openssl-devel libffi-devel python-devel
-    yum update
     /opt/python/${PYTHON}/bin/python -c "import platform; print('Building wheel for {platform} platform.'.format(platform=platform.platform()))"
     /opt/python/${PYTHON}/bin/pip install -r ${WORKDIR_PATH}/requirements/ci-wheel.txt
     /opt/python/${PYTHON}/bin/pip install "$package_name" --no-index -f "file://${WHEELHOUSE_DIR}"