Neither pypi nor github have tag/release of 1.18.1 that was added to tree, making the @world update failing with lack of dist files.
One of my boxes does have docker-compose 1.18.1 so it must have existed at one point. --- 2021-01-25T13:54:24 >>> app-emulation/docker-compose-1.28.1: 4s --- However looking at its github page I don't any 1.18.1 release, which makes me kind of nervous.
(In reply to Albert W. Hopkins from comment #1) > One of my boxes does have docker-compose 1.18.1 so it must have existed at > one point. > > --- > 2021-01-25T13:54:24 >>> app-emulation/docker-compose-1.28.1: 4s > --- > > However looking at its github page I don't any 1.18.1 release, which makes > me kind of nervous. Can you share the distfile from /var/cache/distfiles?
Created attachment 684726 [details] docker-compose 1.28.1 tarball from my distfiles/ Looks innocent. -- diff -Naur compose-1.28.0/CHANGELOG.md compose-1.28.1/CHANGELOG.md --- compose-1.28.0/CHANGELOG.md 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/CHANGELOG.md 2021-01-25 06:57:18.000000000 -0800 @@ -1,7 +1,17 @@ Change log ========== -1.28.0 (2020-12-03) + +1.28.1 (2021-01-25) +------------------- + +### Bugs + +- Revert to Python 3.7 bump for Linux static builds + +- Add bash completion for `docker-compose logs|up --no-log-prefix` + +1.28.0 (2021-01-20) ------------------- ### Features diff -Naur compose-1.28.0/CHANGES.md compose-1.28.1/CHANGES.md --- compose-1.28.0/CHANGES.md 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/CHANGES.md 2021-01-25 06:57:18.000000000 -0800 @@ -1,7 +1,17 @@ Change log ========== -1.28.0 (2020-12-03) + +1.28.1 (2021-01-25) +------------------- + +### Bugs + +- Revert to Python 3.7 bump for Linux static builds + +- Add bash completion for `docker-compose logs|up --no-log-prefix` + +1.28.0 (2021-01-20) ------------------- ### Features diff -Naur compose-1.28.0/compose/cli/main.py compose-1.28.1/compose/cli/main.py --- compose-1.28.0/compose/cli/main.py 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/compose/cli/main.py 2021-01-25 06:57:18.000000000 -0800 @@ -691,7 +691,7 @@ -t, --timestamps Show timestamps. --tail="all" Number of lines to show from the end of the logs for each container. - --no-log-prefix Don't print prefix in logs. + --no-log-prefix Don't print prefix in logs. """ containers = self.project.containers(service_names=options['SERVICE'], stopped=True) @@ -1109,7 +1109,7 @@ container. Implies --abort-on-container-exit. --scale SERVICE=NUM Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. - --no-log-prefix Don't print prefix in logs. + --no-log-prefix Don't print prefix in logs. """ start_deps = not options['--no-deps'] always_recreate_deps = options['--always-recreate-deps'] diff -Naur compose-1.28.0/compose/__init__.py compose-1.28.1/compose/__init__.py --- compose-1.28.0/compose/__init__.py 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/compose/__init__.py 2021-01-25 06:57:18.000000000 -0800 @@ -1 +1 @@ -__version__ = '1.28.0' +__version__ = '1.28.1' diff -Naur compose-1.28.0/contrib/completion/bash/docker-compose compose-1.28.1/contrib/completion/bash/docker-compose --- compose-1.28.0/contrib/completion/bash/docker-compose 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/contrib/completion/bash/docker-compose 2021-01-25 06:57:18.000000000 -0800 @@ -294,7 +294,7 @@ case "$cur" in -*) - COMPREPLY=( $( compgen -W "--follow -f --help --no-color --tail --timestamps -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--follow -f --help --no-color --no-log-prefix --tail --timestamps -t" -- "$cur" ) ) ;; *) __docker_compose_complete_services @@ -549,7 +549,7 @@ case "$cur" in -*) - COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --attach-dependencies --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --attach-dependencies --build -d --detach --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-log-prefix --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) ) ;; *) __docker_compose_complete_services diff -Naur compose-1.28.0/Dockerfile compose-1.28.1/Dockerfile --- compose-1.28.0/Dockerfile 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/Dockerfile 2021-01-25 06:57:18.000000000 -0800 @@ -1,13 +1,13 @@ ARG DOCKER_VERSION=19.03 -ARG PYTHON_VERSION=3.9.0 +ARG PYTHON_VERSION=3.7.9 ARG BUILD_ALPINE_VERSION=3.12 ARG BUILD_CENTOS_VERSION=7 -ARG BUILD_DEBIAN_VERSION=slim-buster +ARG BUILD_DEBIAN_VERSION=slim-stretch ARG RUNTIME_ALPINE_VERSION=3.12 ARG RUNTIME_CENTOS_VERSION=7 -ARG RUNTIME_DEBIAN_VERSION=buster-slim +ARG RUNTIME_DEBIAN_VERSION=stretch-slim ARG DISTRO=alpine @@ -38,7 +38,7 @@ git \ libc-dev \ libffi-dev \ - libgcc-8-dev \ + libgcc-6-dev \ libssl-dev \ make \ openssl \ @@ -68,8 +68,8 @@ COPY docker-compose-entrypoint.sh /usr/local/bin/ COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker RUN pip install \ - virtualenv==20.2.2 \ - tox==3.20.1 + virtualenv==20.4.0 \ + tox==3.21.2 COPY requirements-dev.txt . COPY requirements-indirect.txt . COPY requirements.txt . @@ -79,7 +79,7 @@ COPY setup.py . COPY README.md . COPY compose compose/ -RUN tox --notest +RUN tox -e py37 --notest COPY . . ARG GIT_COMMIT=unknown ENV DOCKER_COMPOSE_GITSHA=$GIT_COMMIT diff -Naur compose-1.28.0/Jenkinsfile compose-1.28.1/Jenkinsfile --- compose-1.28.0/Jenkinsfile 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/Jenkinsfile 2021-01-25 06:57:18.000000000 -0800 @@ -2,7 +2,7 @@ def dockerVersions = ['19.03.13'] def baseImages = ['alpine', 'debian'] -def pythonVersions = ['py39'] +def pythonVersions = ['py37'] pipeline { agent none diff -Naur compose-1.28.0/.pre-commit-config.yaml compose-1.28.1/.pre-commit-config.yaml --- compose-1.28.0/.pre-commit-config.yaml 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/.pre-commit-config.yaml 2021-01-25 06:57:18.000000000 -0800 @@ -17,7 +17,7 @@ sha: v1.3.4 hooks: - id: reorder-python-imports - language_version: 'python3.9' + language_version: 'python3.7' args: - --py3-plus - repo: https://github.com/asottile/pyupgrade diff -Naur compose-1.28.0/Release.Jenkinsfile compose-1.28.1/Release.Jenkinsfile --- compose-1.28.0/Release.Jenkinsfile 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/Release.Jenkinsfile 2021-01-25 06:57:18.000000000 -0800 @@ -2,7 +2,7 @@ def dockerVersions = ['19.03.13', '18.09.9'] def baseImages = ['alpine', 'debian'] -def pythonVersions = ['py39'] +def pythonVersions = ['py37'] pipeline { agent none diff -Naur compose-1.28.0/requirements-indirect.txt compose-1.28.1/requirements-indirect.txt --- compose-1.28.0/requirements-indirect.txt 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/requirements-indirect.txt 2021-01-25 06:57:18.000000000 -0800 @@ -23,6 +23,6 @@ smmap==3.0.4 smmap2==3.0.1 toml==0.10.1 -tox==3.20.1 -virtualenv==20.2.2 +tox==3.21.2 +virtualenv==20.4.0 wcwidth==0.2.5 diff -Naur compose-1.28.0/script/build/linux-entrypoint compose-1.28.1/script/build/linux-entrypoint --- compose-1.28.0/script/build/linux-entrypoint 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/script/build/linux-entrypoint 2021-01-25 06:57:18.000000000 -0800 @@ -3,7 +3,7 @@ set -ex CODE_PATH=/code -VENV="${CODE_PATH}"/.tox/py39 +VENV="${CODE_PATH}"/.tox/py37 cd "${CODE_PATH}" mkdir -p dist diff -Naur compose-1.28.0/script/run/run.sh compose-1.28.1/script/run/run.sh --- compose-1.28.0/script/run/run.sh 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/script/run/run.sh 2021-01-25 06:57:18.000000000 -0800 @@ -15,7 +15,7 @@ set -e -VERSION="1.28.0" +VERSION="1.28.1" IMAGE="docker/compose:$VERSION" diff -Naur compose-1.28.0/script/test/all compose-1.28.1/script/test/all --- compose-1.28.0/script/test/all 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/script/test/all 2021-01-25 06:57:18.000000000 -0800 @@ -11,7 +11,7 @@ "$TAG" tox -e pre-commit get_versions="docker run --rm - --entrypoint=/code/.tox/py39/bin/python + --entrypoint=/code/.tox/py37/bin/python $TAG /code/script/test/versions.py docker/docker-ce,moby/moby" @@ -22,7 +22,7 @@ fi BUILD_NUMBER=${BUILD_NUMBER-$USER} -PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py39} +PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py37} for version in $DOCKER_VERSIONS; do >&2 echo "Running tests against Docker $version" diff -Naur compose-1.28.0/tox.ini compose-1.28.1/tox.ini --- compose-1.28.0/tox.ini 2021-01-19 10:23:34.000000000 -0800 +++ compose-1.28.1/tox.ini 2021-01-25 06:57:18.000000000 -0800 @@ -1,5 +1,5 @@ [tox] -envlist = py39,pre-commit +envlist = py37,py39,pre-commit [testenv] usedevelop=True --
Hi Piotr, hi Albert, I was the one to do the version bump, I understand your concern and appreciate your report. What happened here is that I got a notification mail about a new release 1.28.1 around 2021-01-25 16:43 UTC+2, then went to package the new version and pushed it to Gentoo. Upstream seems to have deleted the Git tag by now! I will complain upstream about this behaviour in a new issue for sure. I confirm that the diff shared by Albert above is super close or identical to what I saw with my own eyes when doing a recursive diff using dev-util/meld as I always do when doing version bumps. I guess I will need to delete the 1.28.1 ebuild from Gentoo in a minute. Please let me know if you have any more questions on this case. Best Sebastian
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6426bd05fb1a47ef67a3249970d0f3202297a3ad commit 6426bd05fb1a47ef67a3249970d0f3202297a3ad Author: Sebastian Pipping <sping@gentoo.org> AuthorDate: 2021-01-26 13:45:08 +0000 Commit: Sebastian Pipping <sping@gentoo.org> CommitDate: 2021-01-26 13:45:16 +0000 app-emulation/docker-compose: Drop 1.28.1 It has been unpublished by upstream before it hit Gentoo mirrors. For more details please see bug #767250. Bug: https://bugs.gentoo.org/767250 Signed-off-by: Sebastian Pipping <sping@gentoo.org> Package-Manager: Portage-3.0.14, Repoman-3.0.2 app-emulation/docker-compose/Manifest | 1 - .../docker-compose/docker-compose-1.28.1.ebuild | 73 ---------------------- 2 files changed, 74 deletions(-)
I have taken this issue upstream now. From my point of view, everything that needs to be done in Gentoo is done. Please feel free to re-open this ticket as needed.
