Merge branch 'release/0.1.7'

.travis/install.sh

@@ -11,6 +11,11 @@ brew install git-lfs
 git lfs install
 git lfs pull
 
+# install retry
+brew install gnu-getopt || true
+sudo curl https://raw.githubusercontent.com/kadwanev/retry/master/retry -o /usr/local/bin/retry
+sudo chmod +x /usr/local/bin/retry
+
 # install python
 mkdir -p ~/local
 git clone https://github.com/tagomoris/xbuild.git ~/local/xbuild

.travis/run.sh

@@ -2,16 +2,19 @@
 
 set -eux
 
+PATH=/usr/local/opt/gnu-getopt/bin:$PATH
+
 # 3.5
-~/local/python-3.5/bin/python setup.py bdist_wheel install test
-~/local/python-3.5/bin/python ./scripts/publish.py
+which retry
+retry -- ~/local/python-3.5/bin/python setup.py bdist_wheel install test
+retry -- ~/local/python-3.5/bin/python ./scripts/publish.py
 ./scripts/clean.sh
 
 # 3.6
-~/local/python-3.6/bin/python setup.py bdist_wheel install test
-~/local/python-3.6/bin/python ./scripts/publish.py
+retry -- ~/local/python-3.6/bin/python setup.py bdist_wheel install test
+retry -- ~/local/python-3.6/bin/python ./scripts/publish.py
 ./scripts/clean.sh
 
 # 3.7
-~/local/python-3.7/bin/python setup.py bdist_wheel install test
-~/local/python-3.7/bin/python ./scripts/publish.py
+retry -- ~/local/python-3.7/bin/python setup.py bdist_wheel install test
+retry -- ~/local/python-3.7/bin/python ./scripts/publish.py

scripts/publish.py

@@ -4,7 +4,6 @@
 import os
 import sys
 import subprocess
-from subprocess import CalledProcessError
 from importlib import machinery
 from pathlib import Path
 
@@ -36,31 +35,19 @@ def find_release_version():
 
 def find_gemfary_packages():
     subprocess.run(['fury', '-v'], stdout=subprocess.PIPE, check=True)
-    try:
-        process = subprocess.run(['fury', 'list',
-            '--as=' + GEMFURY_AS, '--api-token=' + GEMFURY_API_TOKEN],
-            stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
-    except CalledProcessError as e:
-        print(e.output)
-        raise CalledProcessError(
-            returncode=e.returncode, cmd=[], output=e.output, stderr=e.stderr)
-    else:
-        packages = process.stdout.decode('utf-8')
-        return packages
+    process = subprocess.run(['fury', 'list',
+        '--as=' + GEMFURY_AS, '--api-token=' + GEMFURY_API_TOKEN],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
+    packages = process.stdout.decode('utf-8')
+    return packages
 
 
 def find_gemfary_versions():
-    try:
-        process = subprocess.run(['fury', 'versions', PACKAGE_NAME,
-            '--as=' + GEMFURY_AS, '--api-token=' + GEMFURY_API_TOKEN],
-            stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
-    except CalledProcessError as e:
-        print(e.output)
-        raise CalledProcessError(
-            returncode=e.returncode, cmd=[], output=e.output, stderr=e.stderr)
-    else:
-        versions = process.stdout.decode('utf-8')
-        return versions
+    process = subprocess.run(['fury', 'versions', PACKAGE_NAME,
+        '--as=' + GEMFURY_AS, '--api-token=' + GEMFURY_API_TOKEN],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
+    versions = process.stdout.decode('utf-8')
+    return versions
 
 
 def find_wheel_path(version):
@@ -71,14 +58,9 @@ def find_wheel_path(version):
 
 
 def push_to_gemfary(wheel_path):
-    try:
-        subprocess.run(['fury', 'push', wheel_path,
-            '--as=' + GEMFURY_AS, '--api-token=' + GEMFURY_API_TOKEN],
-            stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
-    except CalledProcessError as e:
-        print(e.output)
-        raise CalledProcessError(
-            returncode=e.returncode, cmd=[], output=e.output, stderr=e.stderr)
+    subprocess.run(['fury', 'push', wheel_path,
+        '--as=' + GEMFURY_AS, '--api-token=' + GEMFURY_API_TOKEN],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
 
 
 def publish():

setup.py

@@ -4,7 +4,7 @@
 import sys
 from setuptools import setup, Extension
 
-VERSION = '0.1.6'
+VERSION = '0.1.7'
 
 
 extra_objects = [