Prepare drop of python 2.x support

see https://github.com/docker/compose/issues/6890

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

CHANGELOG.md

@@ -1,110 +1,6 @@
 Change log
 ==========
 
-1.25.0 (2019-11-18)
--------------------
-
-### Features
-
-- Set no-colors to true if CLICOLOR env variable is set to 0
-
-- Add working dir, config files and env file in service labels
-
-- Add dependencies for ARM build
-
-- Add BuildKit support, use `DOCKER_BUILDKIT=1` and `COMPOSE_DOCKER_CLI_BUILD=1`
-
-- Bump paramiko to 2.6.0
-
-- Add working dir, config files and env file in service labels
-
-- Add tag `docker-compose:latest`
-
-- Add `docker-compose:<version>-alpine` image/tag
-
-- Add `docker-compose:<version>-debian` image/tag
-
-- Bumped `docker-py` 4.1.0
-
-- Supports `requests` up to 2.22.0 version
-
-- Drops empty tag on `build:cache_from`
-
-- `Dockerfile` now generates `libmusl` binaries for alpine
-
-- Only pull images that can't be built
-
-- Attribute `scale` can now accept `0` as a value
-
-- Added `--quiet` build flag
-
-- Added `--no-interpolate` to `docker-compose config`
-
-- Bump OpenSSL for macOS build (`1.1.0j` to `1.1.1c`)
-
-- Added `--no-rm` to `build` command
-
-- Added support for `credential_spec`
-
-- Resolve digests without pulling image
-
-- Upgrade `pyyaml` to `4.2b1`
-
-- Lowered severity to `warning` if `down` tries to remove nonexisting image
-
-- Use improved API fields for project events when possible
-
-- Update `setup.py` for modern `pypi/setuptools` and remove `pandoc` dependencies
-
-- Removed `Dockerfile.armhf` which is no longer needed
-
-### Bugfixes
-
-- Make container service color deterministic, remove red from chosen colors
-
-- Fix non ascii chars error. Python2 only
-
-- Format image size as decimal to be align with Docker CLI
-
-- Use Python Posix support to get tty size
-
-- Fix same file 'extends' optimization
-
-- Use python POSIX support to get tty size
-
-- Format image size as decimal to be align with Docker CLI
-
-- Fixed stdin_open
-
-- Fixed `--remove-orphans` when used with `up --no-start`
-
-- Fixed `docker-compose ps --all`
-
-- Fixed `depends_on` dependency recreation behavior
-
-- Fixed bash completion for `build --memory`
-
-- Fixed misleading warning concerning env vars when performing an `exec` command
-
-- Fixed failure check in parallel_execute_watch
-
-- Fixed race condition after pulling image
-
-- Fixed error on duplicate mount points
-
-- Fixed merge on networks section
-
-- Always connect Compose container to `stdin`
-
-- Fixed the presentation of failed services on 'docker-compose start' when containers are not available
-
-1.24.1 (2019-06-24)
--------------------
-
-### Bugfixes
-
-- Fixed acceptance tests
-
 1.24.0 (2019-03-28)
 -------------------
 

Jenkinsfile

@@ -31,7 +31,7 @@ def get_versions = { String imageId, int number ->
   def docker_versions
   wrappedNode(label: "ubuntu && amd64 && !zfs") {
     def result = sh(script: """docker run --rm \\
-        --entrypoint=/code/.tox/py27/bin/python \\
+        --entrypoint=/code/.tox/py37/bin/python \\
         ${imageId} \\
         /code/script/test/versions.py -n ${number} docker/docker-ce recent
       """, returnStdout: true
@@ -48,7 +48,7 @@ def runTests = { Map settings ->
   def imageName = settings.get("image", null)
 
   if (!pythonVersions) {
-    throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py37')`")
+    throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py37')`")
   }
   if (!dockerVersions) {
     throw new Exception("Need Docker versions to test. e.g.: `runTests(dockerVersions: 'all')`")
@@ -82,13 +82,10 @@ def runTests = { Map settings ->
 
 def testMatrix = [failFast: true]
 def baseImages = ['alpine', 'debian']
-def pythonVersions = ['py27', 'py37']
 baseImages.each { baseImage ->
   def imageName = buildImage(baseImage)
   get_versions(imageName, 2).each { dockerVersion ->
-    pythonVersions.each { pyVersion ->
-      testMatrix["${baseImage}_${dockerVersion}_${pyVersion}"] = runTests([baseImage: baseImage, image: imageName, dockerVersions: dockerVersion, pythonVersions: pyVersion])
-    }
+      testMatrix["${baseImage}_${dockerVersion}"] = runTests([baseImage: baseImage, image: imageName, dockerVersions: dockerVersion, pythonVersions: 'py37'])
   }
 }
 

compose/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.25.0'
+__version__ = '1.25.0dev'

script/release/release.py

@@ -204,8 +204,7 @@ def resume(args):
             gh_release = create_release_draft(repository, args.release, pr_data, files)
         delete_assets(gh_release)
         upload_assets(gh_release, files)
-        tag_as_latest = is_tag_latest(args.release)
-        img_manager = ImageManager(args.release, tag_as_latest)
+        img_manager = ImageManager(args.release)
         img_manager.build_images(repository)
     except ScriptError as e:
         print(e)
@@ -245,8 +244,7 @@ def start(args):
         files = downloader.download_all(args.release)
         gh_release = create_release_draft(repository, args.release, pr_data, files)
         upload_assets(gh_release, files)
-        tag_as_latest = is_tag_latest(args.release)
-        img_manager = ImageManager(args.release, tag_as_latest)
+        img_manager = ImageManager(args.release)
         img_manager.build_images(repository)
     except ScriptError as e:
         print(e)

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.25.0"
+VERSION="1.24.0"
 IMAGE="docker/compose:$VERSION"