From 1e4fde8aa7258c3e4c33cbdaf1e71381a5e43c27 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 20 Mar 2019 18:03:41 +0100 Subject: [PATCH 1/4] Bump docker-py version to 3.7.1 This docker-py version includes ssh fixes Signed-off-by: Ulysses Souza --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9333ec60d..2487f92c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ cached-property==1.3.0 certifi==2017.4.17 chardet==3.0.4 colorama==0.4.0; sys_platform == 'win32' -docker==3.7.0 +docker==3.7.1 docker-pycreds==0.4.0 dockerpty==0.4.1 docopt==0.6.2 From cd1fcd3ea52a0453ae26253bbe48e3f24ed722e2 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Fri, 22 Mar 2019 10:32:59 +0100 Subject: [PATCH 2/4] Use os.system() instead of run_setup() Use `os.system()` instead of `run_setup()` because the last is not taking any effect Signed-off-by: Ulysses Souza --- script/release/release.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/release/release.py b/script/release/release.py index 63bf863df..9db1a49d9 100755 --- a/script/release/release.py +++ b/script/release/release.py @@ -7,7 +7,6 @@ import os import shutil import sys import time -from distutils.core import run_setup from jinja2 import Template from release.bintray import BintrayAPI @@ -276,7 +275,8 @@ def finalize(args): repository.checkout_branch(br_name) - run_setup(os.path.join(REPO_ROOT, 'setup.py'), script_args=['sdist', 'bdist_wheel']) + os.system('python {setup_script} sdist bdist_wheel'.format( + setup_script=os.path.join(REPO_ROOT, 'setup.py'))) merge_status = pr_data.merge() if not merge_status.merged and not args.finalize_resume: From 15f8c30a51e7e614a22f66244b06fd2f736ac356 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Fri, 22 Mar 2019 10:58:32 +0100 Subject: [PATCH 3/4] Fix typo on finalize Signed-off-by: Ulysses Souza --- script/release/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/release/README.md b/script/release/README.md index f7f911e53..a0ce5d2a8 100644 --- a/script/release/README.md +++ b/script/release/README.md @@ -129,7 +129,7 @@ assets public), proceed to the "Finalize a release" section of this guide. Once you're ready to make your release public, you may execute the following command from the root of the Compose repository: ``` -./script/release/release.sh -b finalize RELEAE_VERSION +./script/release/release.sh -b finalize RELEASE_VERSION ``` Note that this command will create and publish versioned assets to the public. From 2948c396a6abc853ffcb16051f3593a70e43625d Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Fri, 22 Mar 2019 11:00:23 +0100 Subject: [PATCH 4/4] Fix bintray docker-compose link Signed-off-by: Ulysses Souza --- script/release/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/release/README.md b/script/release/README.md index a0ce5d2a8..0c6f12cbe 100644 --- a/script/release/README.md +++ b/script/release/README.md @@ -40,7 +40,7 @@ This API token should be exposed to the release script through the ### A Bintray account and Bintray API key Your Bintray account will need to be an admin member of the -[docker-compose organization](https://github.com/settings/tokens). +[docker-compose organization](https://bintray.com/docker-compose). Additionally, you should generate a personal API key. To do so, click your username in the top-right hand corner and select "Edit profile" ; on the new page, select "API key" in the left-side menu.