Merge branch 'master' into issue_115

.travis.yml

@@ -8,24 +8,27 @@ jobs:
         - stage: test
           os: osx
           language: generic
-          env: PYTHON_VERSION=3.4.8
+          env: PYTHON_VERSION=3.4.9
         - stage: test
           os: osx
           language: generic
-          env: PYTHON_VERSION=3.5.5
+          env: PYTHON_VERSION=3.5.6
         - stage: test
           os: osx
           language: generic
-          env: PYTHON_VERSION=3.6.4
-
+          env: PYTHON_VERSION=3.6.8
+        - stage: test
+          os: osx
+          language: generic
+          env: PYTHON_VERSION=3.7.2
 
 before_install:
-    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sh ci/install_python_for_osx.sh; fi
-    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then source ~/venv/bin/activate; fi
-
     # workaround for Travis CI stdout write error
     # ref: <https://github.com/travis-ci/travis-ci/issues/4704#issuecomment-348435959>
     - python -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sh ci/install_python_for_osx.sh; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then source ~/venv/bin/activate; fi
+    - python --version  # Check the specifically installed Python version
 
 install:
     - "pip install -U setuptools"   # for upgrade issue with setuptools and CPython 3.6 on Travis CI

Pipfile

@@ -17,6 +17,6 @@ requests = "==2.21.0"
 coverage = "==4.5.3"
 flake8 = "==3.7.7"
 pyjokes = "==0.5.0"
-pytest = "==4.3.1"
+pytest = "==4.4.0"
 pytest-cov = "==2.6.1"
 pytest-flake8 = "==1.0.4"

ci/install_python_for_osx.sh

@@ -1,6 +1,17 @@
 #!/usr/bin/sh
 
+set -ev
+
 curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
-~/.pyenv/bin/pyenv install $PYTHON_VERSION
-~/.pyenv/versions/$PYTHON_VERSION/bin/python3 --version
+
+# Make it use openssl only
+brew uninstall openssl@1.1
+
+# print openssl path
+brew --prefix openssl
+
+# Install specific version of Python via pyenv
+~/.pyenv/bin/pyenv install -v $PYTHON_VERSION
+
+# Create venv with the specific Python version
 ~/.pyenv/versions/$PYTHON_VERSION/bin/python3 -m venv ~/venv

requirements-test.txt

@@ -1,6 +1,6 @@
 coverage==4.5.3
 flake8==3.7.7
 pyjokes==0.5.0
-pytest==4.3.1
+pytest==4.4.0
 pytest-cov==2.6.1
 pytest-flake8==1.0.4