"Bump 1.29.2"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

CHANGELOG.md

@@ -1,6 +1,17 @@
 Change log
 ==========
 
+1.29.2 (2021-05-10)
+-------------------
+
+[List of PRs / issues for this release](https://github.com/docker/compose/milestone/59?closed=1)
+
+### Miscellaneous
+
+- Remove advertisement for `docker compose` in the `up` command to avoid annoyance
+
+- Bump `py` to `1.10.0` in `requirements-indirect.txt`
+
 1.29.1 (2021-04-13)
 -------------------
 

Jenkinsfile

@@ -87,7 +87,7 @@ def buildImage(baseImage) {
 def runTests(dockerVersion, pythonVersion, baseImage) {
     return {
         stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
-            node("ubuntu && amd64 && !zfs") {
+            node("ubuntu-2004 && amd64 && !zfs && cgroup1") {
                 def scmvar = checkout(scm)
                 def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
                 def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()

compose/__init__.py

@@ -1 +1 @@
-__version__ = '1.29.1'
+__version__ = '1.29.2'

compose/cli/main.py

@@ -1144,9 +1144,6 @@ class TopLevelCommand:
         attach_dependencies = options.get('--attach-dependencies')
         keep_prefix = not options.get('--no-log-prefix')
 
-        if not IS_LINUX_PLATFORM:
-            print('Docker Compose is now in the Docker CLI, try `docker compose up`\n')
-
         if detached and (cascade_stop or exit_value_from or attach_dependencies):
             raise UserError(
                 "-d cannot be combined with --abort-on-container-exit or --attach-dependencies.")

requirements-indirect.txt

@@ -13,7 +13,7 @@ more-itertools==8.6.0; python_version >= '3.5'
 more-itertools==5.0.0; python_version < '3.5'
 packaging==20.9
 pluggy==0.13.1
-py==1.9.0
+py==1.10.0
 pycodestyle==2.6.0
 pycparser==2.20
 pyflakes==2.2.0

script/run/run.sh

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

script/test/all

@@ -43,7 +43,6 @@ for version in $DOCKER_VERSIONS; do
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    -v $DOCKER_CONFIG/config.json:/root/.docker/config.json \
     -e "DOCKER_TLS_CERTDIR=" \
     "docker:$version-dind" \
     dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
@@ -51,6 +50,11 @@ for version in $DOCKER_VERSIONS; do
 
   docker exec "$daemon_container" sh -c "apk add --no-cache git"
 
+  # copy docker config from host for authentication with Docker Hub
+  docker exec "$daemon_container" sh -c "mkdir /root/.docker"
+  docker cp /root/.docker/config.json $daemon_container:/root/.docker/config.json
+  docker exec "$daemon_container" sh -c "chmod 644 /root/.docker/config.json"
+
   docker run \
     --rm \
     --tty \

tests/integration/project_test.py

@@ -1955,12 +1955,10 @@ class ProjectTest(DockerClientTestCase):
         with pytest.raises(ProjectError):
             project.up()
 
-        containers = project.containers()
-        assert len(containers) == 0
-
         svc1 = project.get_service('svc1')
         svc2 = project.get_service('svc2')
         assert 'svc1' in svc2.get_dependency_names()
+        assert len(svc2.containers()) == 0
         with pytest.raises(CompletedUnsuccessfully):
             svc1.is_completed_successfully()
 
@@ -1993,14 +1991,12 @@ class ProjectTest(DockerClientTestCase):
         with pytest.raises(ProjectError):
             project.up()
 
-        containers = project.containers()
-        assert len(containers) == 0
-
         svc1 = project.get_service('svc1')
         svc2 = project.get_service('svc2')
         svc3 = project.get_service('svc3')
         assert ['svc1', 'svc2'] == svc3.get_dependency_names()
         assert svc1.is_completed_successfully()
+        assert len(svc3.containers()) == 0
         with pytest.raises(CompletedUnsuccessfully):
             svc2.is_completed_successfully()