"Bump 1.26.2"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
Enforce pip3 and python3 on Release Jenkins
2026-02-12 11:39:23 +08:00 · 2020-07-02 18:09:01 +02:00 · 2020-07-02 18:09:01 +02:00 · 2020-07-02 15:33:27 +02:00 · 2020-07-02 13:41:23 +02:00
5 changed files with 22 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Change log
 ==========

+1.26.2 (2020-07-02)
+-------------------
+
+### Bugs
+
+- Enforce `docker-py` 4.2.2 as minimum version when installing with pip
+
 1.26.1 (2020-06-30)
 -------------------

--- a/Release.Jenkinsfile
+++ b/Release.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
            parallel {
                stage('alpine') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    steps {
                        buildImage('alpine')
@@ -28,7 +28,7 @@ pipeline {
                }
                stage('debian') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    steps {
                        buildImage('debian')
@@ -55,7 +55,7 @@ pipeline {
        }
        stage('Generate Changelog') {
            agent {
-                label 'linux'
+                label 'linux && docker && ubuntu-2004'
            }
            steps {
                checkout scm
@@ -92,7 +92,7 @@ pipeline {
                }
                stage('linux binary') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    steps {
                        checkout scm
@@ -128,7 +128,7 @@ pipeline {
                }
                stage('alpine image') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    steps {
                        buildRuntimeImage('alpine')
@@ -136,7 +136,7 @@ pipeline {
                }
                stage('debian image') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    steps {
                        buildRuntimeImage('debian')
@@ -151,7 +151,7 @@ pipeline {
            parallel {
                stage('Pushing images') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    steps {
                        pushRuntimeImage('alpine')
@@ -160,7 +160,7 @@ pipeline {
                }
                stage('Creating Github Release') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    environment {
                        GITHUB_TOKEN = credentials('github-release-token')
@@ -192,7 +192,7 @@ pipeline {
                }
                stage('Publishing Python packages') {
                    agent {
-                        label 'linux'
+                        label 'linux && docker && ubuntu-2004'
                    }
                    environment {
                        PYPIRC = credentials('pypirc-docker-dsg-cibot')
@@ -201,9 +201,9 @@ pipeline {
                        checkout scm
                        sh """
                            rm -rf build/ dist/
-                            pip install wheel
-                            python setup.py sdist bdist_wheel
-                            pip install twine
+                            pip3 install wheel
+                            python3 setup.py sdist bdist_wheel
+                            pip3 install twine
                            ~/.local/bin/twine upload --config-file ${PYPIRC} ./dist/docker-compose-*.tar.gz ./dist/docker_compose-*-py2.py3-none-any.whl
                        """
                    }
--- a/compose/init.py
+++ b/compose/init.py
@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals

-__version__ = '1.26.1'
+__version__ = '1.26.2'
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@

 set -e

-VERSION="1.26.1"
+VERSION="1.26.2"
 IMAGE="docker/compose:$VERSION"


--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ install_requires = [
    'texttable >= 0.9.0, < 2',
    'websocket-client >= 0.32.0, < 1',
    'distro >= 1.5.0, < 2',
-    'docker[ssh] >= 4.2.1, < 5',
+    'docker[ssh] >= 4.2.2, < 5',
    'dockerpty >= 0.4.1, < 1',
    'six >= 1.3.0, < 2',
    'jsonschema >= 2.5.1, < 4',
Author	SHA1	Message	Date
Ulysses Souza	eefe0d319f	"Bump 1.26.2" Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>	2020-07-02 18:09:01 +02:00
Ulysses Souza	76e20a8ff2	Enforce pip3 and python3 on Release Jenkins Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>	2020-07-02 18:09:01 +02:00
Ulysses Souza	bfa7406872	Apply more specific filtering CI machines Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>	2020-07-02 15:33:27 +02:00
Sebastiaan van Stijn	757f7b784d	setyp.py: fix minimum docker-py requirement to 4.2.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2020-07-02 13:41:23 +02:00