From 89f54025e2b48d71cdcefa9f61bc20bc8ab1ed98 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Wed, 17 Jul 2019 02:07:32 -0400 Subject: [PATCH 01/10] [post-release] Update whl build direction of skyapi --- .travis/build_wheels_skyapi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/build_wheels_skyapi.sh b/.travis/build_wheels_skyapi.sh index f0ab49d2..1e0e4d14 100755 --- a/.travis/build_wheels_skyapi.sh +++ b/.travis/build_wheels_skyapi.sh @@ -25,6 +25,6 @@ done # Bundle external shared libraries into the wheels for whl in wheelhouse/*.whl; do - auditwheel repair "$whl" -w /io/lib/skyapi/wheelhouse/ + auditwheel repair "$whl" -w /io/wheelhouse/ done From 4a9f5127381ff9fbbed1e1d5cb45f97af9cd8d53 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Wed, 17 Jul 2019 02:10:14 -0400 Subject: [PATCH 02/10] [version] Update package version to 0.25.1.post2 --- lib/skyapi/setup.py | 2 +- skycoin/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/skyapi/setup.py b/lib/skyapi/setup.py index 3e0acb50..b602cec6 100644 --- a/lib/skyapi/setup.py +++ b/lib/skyapi/setup.py @@ -16,7 +16,7 @@ from os import path NAME = "skyapi" -VERSION = "0.25.1.post1" +VERSION = "0.25.1.post2" # To install the library, run the following # # python setup.py install diff --git a/skycoin/__init__.py b/skycoin/__init__.py index d19c072f..bd52088e 100644 --- a/skycoin/__init__.py +++ b/skycoin/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.25.1.post1" +__version__ = "0.25.1.post2" init_error = None def _print2stderr(msg): From 8e8b9ab7e7236ace478db02acfcf8c02e744fec3 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Wed, 17 Jul 2019 02:12:03 -0400 Subject: [PATCH 03/10] [wheel] Update wheel output directory in skyapi package --- .travis/build_wheels_skyapi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/build_wheels_skyapi.sh b/.travis/build_wheels_skyapi.sh index 1e0e4d14..fc8c8036 100755 --- a/.travis/build_wheels_skyapi.sh +++ b/.travis/build_wheels_skyapi.sh @@ -20,11 +20,11 @@ go env # Compile wheels for PYBIN in /opt/python/*/bin; do "${PYBIN}/pip" install -r /io/lib/skyapi/requirements.txt - "${PYBIN}/pip" wheel /io/lib/skyapi/ -w wheelhouse/ + "${PYBIN}/pip" wheel /io/lib/skyapi/ -w /io/lib/skyapi/wheelhouse/ done # Bundle external shared libraries into the wheels for whl in wheelhouse/*.whl; do - auditwheel repair "$whl" -w /io/wheelhouse/ + auditwheel repair "$whl" -w /io/lib/skyapi/wheelhouse/ done From c8281d16266f4dd67d157c7c83443817fc7d3ff4 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Wed, 17 Jul 2019 21:52:19 -0400 Subject: [PATCH 04/10] [release] Update skyapi wheel build direction --- .circleci/upload_pypi.sh | 3 +++ .travis/build_wheels_skyapi.sh | 2 +- .travis/skyapi_deploy.sh | 2 +- docker/images/deploy/Dockerfile-arm | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/upload_pypi.sh b/.circleci/upload_pypi.sh index d80c121f..6bfa3f3e 100644 --- a/.circleci/upload_pypi.sh +++ b/.circleci/upload_pypi.sh @@ -5,11 +5,14 @@ set -x if [[ "$URL_DEPLOY" ]]; then $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing --repository-url ${URL_DEPLOY} /io/dist/*sky* + $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing --repository-url ${URL_DEPLOY} /io/lib/skyapi/dist/*sky* else $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing /io/dist/*sky* + $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing /io/lib/skyapi/dist/*sky* go get github.com/tcnksm/ghr ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} ${VERSION} /io/dist/*sky* + ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} ${VERSION} /io/lib/skyapi/dist/*sky* fi \ No newline at end of file diff --git a/.travis/build_wheels_skyapi.sh b/.travis/build_wheels_skyapi.sh index fc8c8036..47a22895 100755 --- a/.travis/build_wheels_skyapi.sh +++ b/.travis/build_wheels_skyapi.sh @@ -24,7 +24,7 @@ for PYBIN in /opt/python/*/bin; do done # Bundle external shared libraries into the wheels -for whl in wheelhouse/*.whl; do +for whl in /io/lib/skyapi/wheelhouse/*.whl; do auditwheel repair "$whl" -w /io/lib/skyapi/wheelhouse/ done diff --git a/.travis/skyapi_deploy.sh b/.travis/skyapi_deploy.sh index bb439cc6..0787817e 100755 --- a/.travis/skyapi_deploy.sh +++ b/.travis/skyapi_deploy.sh @@ -4,4 +4,4 @@ python -m pip install twine #Upload to PyPi echo "Upload to PyPI" -twine upload -u $PYPI_USER -p $PYPI_PASSWD --repository-url https://upload.pypi.org/legacy/ lib/skyapi/dist/* +twine upload -u $PYPI_USER -p $PYPI_PASSWD --repository-url https://upload.pypi.org/legacy/ lib/skyapi/dist/*sky* diff --git a/docker/images/deploy/Dockerfile-arm b/docker/images/deploy/Dockerfile-arm index b741ced9..fd056449 100644 --- a/docker/images/deploy/Dockerfile-arm +++ b/docker/images/deploy/Dockerfile-arm @@ -65,6 +65,7 @@ RUN sh /io/.circleci/circle_wheels_arm.sh RUN ls /io/wheelhouse RUN mkdir -p /io/dist RUN cp -v /io/wheelhouse/* /io/dist +RUN cp -v /io/lib/skyapi/wheelhouse/* /io/dist RUN pip install twine ENV TWINE_PATH=twine RUN bash /io/.circleci/upload_pypi.sh From d1cb3b938d7d52d78ccc057dd409d9c79bdf99e9 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Wed, 17 Jul 2019 22:44:48 -0400 Subject: [PATCH 05/10] [release] Remove upload of whl in folder /io/lib/skyapi/dist --- .circleci/upload_pypi.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/upload_pypi.sh b/.circleci/upload_pypi.sh index 6bfa3f3e..623fc298 100644 --- a/.circleci/upload_pypi.sh +++ b/.circleci/upload_pypi.sh @@ -10,9 +10,7 @@ if [[ "$URL_DEPLOY" ]]; then else $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing /io/dist/*sky* - $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing /io/lib/skyapi/dist/*sky* go get github.com/tcnksm/ghr ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} ${VERSION} /io/dist/*sky* - ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} ${VERSION} /io/lib/skyapi/dist/*sky* fi \ No newline at end of file From c6cd670386e9855e33c1fe8296c4f5e849183597 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Wed, 17 Jul 2019 22:45:50 -0400 Subject: [PATCH 06/10] [version] Update package version to 0.25.1.post3 --- lib/skyapi/setup.py | 2 +- skycoin/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/skyapi/setup.py b/lib/skyapi/setup.py index b602cec6..839edd10 100644 --- a/lib/skyapi/setup.py +++ b/lib/skyapi/setup.py @@ -16,7 +16,7 @@ from os import path NAME = "skyapi" -VERSION = "0.25.1.post2" +VERSION = "0.25.1.post3" # To install the library, run the following # # python setup.py install diff --git a/skycoin/__init__.py b/skycoin/__init__.py index bd52088e..7dc03370 100644 --- a/skycoin/__init__.py +++ b/skycoin/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.25.1.post2" +__version__ = "0.25.1.post3" init_error = None def _print2stderr(msg): From 6a35f1639e9b1308db4f6e224889c8ecfa09fc99 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Thu, 18 Jul 2019 08:36:10 -0400 Subject: [PATCH 07/10] [wheel] Remove twine upload to lib/skyapi --- .circleci/upload_pypi.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/upload_pypi.sh b/.circleci/upload_pypi.sh index 623fc298..d80c121f 100644 --- a/.circleci/upload_pypi.sh +++ b/.circleci/upload_pypi.sh @@ -5,7 +5,6 @@ set -x if [[ "$URL_DEPLOY" ]]; then $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing --repository-url ${URL_DEPLOY} /io/dist/*sky* - $TWINE_PATH upload -u ${PYPI_USER} -p ${PYPI_PASSWD} --skip-existing --repository-url ${URL_DEPLOY} /io/lib/skyapi/dist/*sky* else From 57525efbf227633e9bf15b1cc12e3d04ec2784f1 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Thu, 18 Jul 2019 08:36:36 -0400 Subject: [PATCH 08/10] [version] Update package version to 0.25.1.post4 --- lib/skyapi/setup.py | 2 +- skycoin/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/skyapi/setup.py b/lib/skyapi/setup.py index 839edd10..fccb6225 100644 --- a/lib/skyapi/setup.py +++ b/lib/skyapi/setup.py @@ -16,7 +16,7 @@ from os import path NAME = "skyapi" -VERSION = "0.25.1.post3" +VERSION = "0.25.1.post4" # To install the library, run the following # # python setup.py install diff --git a/skycoin/__init__.py b/skycoin/__init__.py index 7dc03370..b89ea36e 100644 --- a/skycoin/__init__.py +++ b/skycoin/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.25.1.post3" +__version__ = "0.25.1.post4" init_error = None def _print2stderr(msg): From ad26b74426c0e97256374ecde863ca80dd22b9ea Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Thu, 18 Jul 2019 10:08:57 -0400 Subject: [PATCH 09/10] [release] Update Dockerfile-arm to use only /io/wheelhouse as wheel dir --- docker/images/deploy/Dockerfile-arm | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/images/deploy/Dockerfile-arm b/docker/images/deploy/Dockerfile-arm index fd056449..b741ced9 100644 --- a/docker/images/deploy/Dockerfile-arm +++ b/docker/images/deploy/Dockerfile-arm @@ -65,7 +65,6 @@ RUN sh /io/.circleci/circle_wheels_arm.sh RUN ls /io/wheelhouse RUN mkdir -p /io/dist RUN cp -v /io/wheelhouse/* /io/dist -RUN cp -v /io/lib/skyapi/wheelhouse/* /io/dist RUN pip install twine ENV TWINE_PATH=twine RUN bash /io/.circleci/upload_pypi.sh From 222b958dbb8004439b58a3b541b7ee17bd29cec8 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Thu, 18 Jul 2019 10:09:29 -0400 Subject: [PATCH 10/10] [version] Update package version to 0.25.1.post5 --- lib/skyapi/setup.py | 2 +- skycoin/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/skyapi/setup.py b/lib/skyapi/setup.py index fccb6225..37e6cfd3 100644 --- a/lib/skyapi/setup.py +++ b/lib/skyapi/setup.py @@ -16,7 +16,7 @@ from os import path NAME = "skyapi" -VERSION = "0.25.1.post4" +VERSION = "0.25.1.post5" # To install the library, run the following # # python setup.py install diff --git a/skycoin/__init__.py b/skycoin/__init__.py index b89ea36e..aefda6d2 100644 --- a/skycoin/__init__.py +++ b/skycoin/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.25.1.post4" +__version__ = "0.25.1.post5" init_error = None def _print2stderr(msg):