From 9c12cfacdc881a94e4df003443db8647e22bcf23 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 9 Jul 2018 20:20:40 +0200 Subject: [PATCH 1/4] Add missing requirement to orcestra in-requirements.txt --- contrib/runners/orchestra_runner/in-requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 contrib/runners/orchestra_runner/in-requirements.txt diff --git a/contrib/runners/orchestra_runner/in-requirements.txt b/contrib/runners/orchestra_runner/in-requirements.txt new file mode 100644 index 0000000000..236a1e3040 --- /dev/null +++ b/contrib/runners/orchestra_runner/in-requirements.txt @@ -0,0 +1 @@ +git+https://github.com/StackStorm/orchestra.git#egg=orchestra From 8c5c5c3db14f904e40c6deef12516a3404bcffb3 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 9 Jul 2018 20:22:05 +0200 Subject: [PATCH 2/4] Re-generate dist_utils.py files. --- contrib/runners/winrm_runner/dist_utils.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/runners/winrm_runner/dist_utils.py b/contrib/runners/winrm_runner/dist_utils.py index ede9e4a358..965e6387da 100644 --- a/contrib/runners/winrm_runner/dist_utils.py +++ b/contrib/runners/winrm_runner/dist_utils.py @@ -54,13 +54,15 @@ ] -def check_pip_version(): +def check_pip_version(min_version='6.0.0'): """ Ensure that a minimum supported version of pip is installed. """ - if StrictVersion(pip.__version__) < StrictVersion('6.0.0'): - print("Upgrade pip, your version `{0}' " - "is outdated:\n{1}".format(pip.__version__, GET_PIP)) + if StrictVersion(pip.__version__) < StrictVersion(min_version): + print("Upgrade pip, your version '{0}' " + "is outdated. Minimum required version is '{1}':\n{2}".format(pip.__version__, + min_version, + GET_PIP)) sys.exit(1) @@ -71,8 +73,10 @@ def fetch_requirements(requirements_file_path): links = [] reqs = [] for req in parse_requirements(requirements_file_path, session=False): - if req.link: - links.append(str(req.link)) + # Note: req.url was used before 9.0.0 and req.link is used in all the recent versions + link = getattr(req, 'link', getattr(req, 'url', None)) + if link: + links.append(str(link)) reqs.append(str(req.req)) return (reqs, links) From dd21eb9e30f0f7c1c83051950d1a3d5d3be44ac4 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Mon, 9 Jul 2018 20:22:28 +0200 Subject: [PATCH 3/4] Re generate orchestra requirements.txt file. --- contrib/runners/orchestra_runner/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/runners/orchestra_runner/requirements.txt b/contrib/runners/orchestra_runner/requirements.txt index 236a1e3040..5aa11564d7 100644 --- a/contrib/runners/orchestra_runner/requirements.txt +++ b/contrib/runners/orchestra_runner/requirements.txt @@ -1 +1,2 @@ +# Don't edit this file. It's generated automatically! git+https://github.com/StackStorm/orchestra.git#egg=orchestra From 3dcfcfecd16ee5baa755661bcba0ea632c39b6c8 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Tue, 10 Jul 2018 10:54:14 +0200 Subject: [PATCH 4/4] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fdc1aaa04e..2cab9bf416 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ * Install Get yourself a clean 64-bit Linux box that fits the [system requirements](https://docs.stackstorm.com/install/system_requirements.html). Run the installer script: - ``` + ```bash curl -sSL https://stackstorm.com/packages/install.sh | bash -s -- --user=st2admin --password=Ch@ngeMe ``` * Read the docs: [https://docs.stackstorm.com/index.html](https://docs.stackstorm.com/install/index.html)