#5 [DO NOT MERGE] Update to 2.26.0. Fixes rhbz#2000794.
Opened 2 months ago by gotmax23. Modified 13 days ago
rpms/ gotmax23/docker-compose 2.26.0  into  rawhide

file modified
+2
@@ -39,3 +39,5 @@ 

  /docker-compose-1.28.6.tar.gz

  /docker-compose-1.29.1.tar.gz

  /docker-compose-1.29.2.tar.gz

+ /compose-2.26.0-vendor.tar.bz2

+ /compose-2.26.0.tar.gz

file added
+297
@@ -0,0 +1,297 @@ 

+ * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-12

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

+ 

+ * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-11

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

+ 

+ * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-10

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

+ 

+ * Fri Jun 30 2023 Python Maint <python-maint@redhat.com> - 1.29.2-9

+ - Rebuilt for Python 3.12

+ 

+ * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-8

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

+ 

+ * Wed Nov 16 2022 Lumír Balhar <lbalhar@redhat.com> - 1.29.2-7

+ - Fix compatibility with pytest 7.2

+ 

+ * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-6

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

+ 

+ * Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 1.29.2-5

+ - Rebuilt for Python 3.11

+ 

+ * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-4

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

+ 

+ * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-3

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

+ 

+ * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.29.2-2

+ - Rebuilt for Python 3.10

+ 

+ * Mon May 10 2021 Michael Hampton <error@ioerror.us> - 1.29.2-1

+ - Update to 1.29.2

+ 

+ * Wed Apr 21 2021 Michael Hampton <error@ioerror.us> - 1.29.1-1

+ - Rebase to 1.29.1

+ 

+ * Mon Mar 29 2021 Michael Hampton <error@ioerror.us> - 1.28.6-1

+ - Rebase to 1.28.6

+ 

+ * Fri Feb 26 2021 Michael Hampton <error@ioerror.us> - 1.28.5-1

+ - Rebase to 1.28.5

+ 

+ * Fri Feb 19 2021 Michael Hampton <error@ioerror.us> - 1.28.4-1

+ - Rebase to 1.28.4

+ 

+ * Wed Jan 27 2021 Michael Hampton <error@ioerror.us> - 1.28.2-1

+ - Rebase to 1.28.2

+ 

+ * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.0-2

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

+ 

+ * Wed Jan 20 2021 Michael Hampton <error@ioerror.us> - 1.28.0-1

+ - Rebase to 1.28.0

+ 

+ * Thu Sep 24 2020 Michael Hampton <error@ioerror.us> - 1.27.4-1

+ - Rebase to 1.27.4

+ 

+ * Wed Sep 16 2020 Michael Hampton <error@ioerror.us> - 1.27.3-2

+ - Requires python-docker 4.3.1

+ 

+ * Wed Sep 16 2020 Michael Hampton <error@ioerror.us> - 1.27.3-1

+ - Rebase to 1.27.3

+ 

+ * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.4-3

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

+ 

+ * Tue Jul 14 2020 Michael Hampton <error@ioerror.us> - 1.26.2-1

+ - Rebase to 1.26.2

+ - Add python-distro build dependency

+ - Add python-dotenv build dependency

+ 

+ * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.25.4-2

+ - Rebuilt for Python 3.9

+ 

+ * Mon Mar 23 2020 Michael Hampton <error@ioerror.us> - 1.25.4-2

+ - Remove patch for BZ#1705955 it is now in upstream source

+ - Add python-ddt build dependency

+ 

+ * Sat Feb 29 2020 Michael Hampton <error@ioerror.us> - 1.25.4-1

+ - Rebase to 1.25.4

+ 

+ * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.1-4

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

+ 

+ * Mon Oct  7 2019 Michael Hampton <error@ioerror.us> - 1.24.1-3

+ - Require python-docker 4.0.2-2 for ssh feature

+ 

+ * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.24.1-2

+ - Rebuilt for Python 3.8.0rc1 (#1748018)

+ 

+ * Tue Sep 17 2019 Michael Hampton <error@ioerror.us> - 1.24.1-2

+ - Require python-docker 4.0.2 for ssh feature

+ 

+ * Wed Aug 28 2019 Michael Hampton <error@ioerror.us> - 1.24.1-1

+ - Rebase to 1.24.1 (BZ#1691898)

+ - Patch tests for pytest 5 compatibility (BZ#1705955)

+ 

+ * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.22.0-6

+ - Rebuilt for Python 3.8

+ 

+ * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-5

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

+ 

+ * Wed Jul 10 2019 Michael Hampton <error@ioerror.us> - 1.22.0-4

+ 

+ * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

+ 

+ * Mon Oct 08 2018 Carl George <carl@george.computer> - 1.22.0-2

+ - Run upstream unit tests

+ 

+ * Wed Jul 18 2018 Michael Hampton <error@ioerror.us> - 1.22.0-1

+ - Update to 1.22.0

+ 

+ * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.1-3

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

+ 

+ * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.20.1-2

+ - Rebuilt for Python 3.7

+ 

+ * Tue Mar 27 2018 Michael Hampton <error@ioerror.us> - 1.20.1-1

+ - Update to 1.20.1

+ 

+ * Wed Mar 21 2018 Michael Hampton <error@ioerror.us> - 1.20.0-1

+ - Update to 1.20.0

+ 

+ * Fri Mar 02 2018 Adam Williamson <awilliam@redhat.com> - 1.19.0-2

+ - Backport upstream patch for compatibility with python-docker 3.0.0

+ 

+ * Mon Feb 19 2018 Michael Hampton <error@ioerror.us> - 1.19.0-1

+ - Update to 1.19.0

+ 

+ * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

+ 

+ * Tue Dec 26 2017 Carl George <carl@george.computer> - 1.18.0-1

+ - Latest upstream

+ - Drop patch0 and patch1, use sed on setup.py instead

+ - Rebase patch2

+ 

+ * Thu Nov  9 2017 Michael Hampton <error@ioerror.us> - 1.17.1-1

+ - Update to 1.17.1 (#1511455)

+ 

+ * Thu Nov  2 2017 Michael Hampton <error@ioerror.us> - 1.17.0-1

+ - Update to 1.17.0 (#1504337)

+ 

+ * Sun Sep 10 2017 Carl George <carl@george.computer> - 1.16.1-2

+ - Align dependencies with upstream

+ - RHEL compatibility

+ - Add bash, zsh, and fish completions

+ 

+ * Sat Sep  2 2017 Michael Hampton <error@ioerror.us> - 1.16.1-1

+ - Update to 1.16.1 (#1483776)

+ 

+ * Fri Jul 28 2017 Michael Hampton <error@ioerror.us> - 1.15.0-1

+ - Update to 1.15.0 (#1471093)

+ - Explicit python3-docker requirement

+ - New upstream requirements python3-pysocks, python3-certifi, python3-idna

+ 

+ * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-2

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

+ 

+ * Tue Jun 20 2017 Michael Hampton <error@ioerror.us> - 1.14.0-1

+ - Update to upstream 1.14.0

+ 

+ * Mon May  8 2017 Michael Hampton <error@ioerror.us> - 1.13.0-1

+ - Update to upstream 1.13.0

+ 

+ * Fri Apr  7 2017 Michael Hampton <error@ioerror.us> - 1.12.0-1

+ - Update to upstream 1.12.0

+ 

+ * Thu Mar  2 2017 Michael Hampton <error@ioerror.us> - 1.11.2-1

+ - Update to upstream 1.11.2

+ 

+ * Tue Feb 28 2017 Michael Hampton <error@ioerror.us> - 1.11.1-3

+ - Remove requirements upper bound from setup.py; BZ#1426145

+ - Added new dependency python3-colorama

+ 

+ * Fri Feb 17 2017 Michael Hampton <error@ioerror.us> - 1.11.1-2

+ - python-docker-py package name changed to python-docker; BZ#1422198

+ 

+ * Fri Feb 10 2017 Michael Hampton <error@ioerror.us> - 1.11.1-1

+ - Update to upstream 1.11.1

+ 

+ * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-2

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

+ 

+ * Fri Feb  3 2017 Michael Hampton <error@ioerror.us> - 1.10.1-1

+ - Update to upstream 1.10.1

+ 

+ * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.9.0-3

+ - Rebuild for Python 3.6

+ 

+ * Mon Nov 21 2016 Michael Hampton <error@ioerror.us> - 1.9.0-2

+ - BZ#1396852

+ 

+ * Sat Nov 19 2016 Michael Hampton <error@ioerror.us> - 1.9.0-1

+ - Update to upstream 1.9.0

+ 

+ * Fri Sep 23 2016 Michael Hampton <error@ioerror.us> - 1.8.1-1

+ - Update to upstream 1.8.1

+ 

+ * Sat Sep 10 2016 Michael Hampton <error@ioerror.us> - 1.8.0-2

+ - Port to Python 3, BZ#1374656

+ 

+ * Thu Jul 28 2016 Michael Hampton <error@ioerror.us> - 1.8.0-1

+ - Update to upstream 1.8.0

+ 

+ * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-2

+ - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

+ 

+ * Thu May 05 2016 Michael Hampton <error@ioerror.us> - 1.7.1-1

+ - Update to upstream 1.7.1

+ - Updated package description from upstream

+ 

+ * Thu Apr 14 2016 Michael Hampton <error@ioerror.us> - 1.7.0-1

+ - Update to upstream 1.7.0

+ 

+ * Fri Feb 05 2016 Michael Hampton <error@ioerror.us> - 1.6.0-1

+ - Update to upstream 1.6.0

+ 

+ * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-5

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

+ 

+ * Tue Jan 12 2016 Michael Hampton <error@ioerror.us> - 1.5.2-4

+ - Added missing dependency python-enum34

+ 

+ * Mon Jan 11 2016 Michael Hampton <error@ioerror.us> - 1.5.2-3

+ - Added missing dependency python-jsonschema

+ 

+ * Wed Dec 30 2015 Michael Hampton <error@ioerror.us> - 1.5.2-2

+ - Updated locations of docs

+ 

+ * Wed Dec 30 2015 Michael Hampton <error@ioerror.us> - 1.5.2-1

+ - Update to upstream 1.5.2

+ 

+ * Wed Sep 23 2015 Michael Hampton <error@ioerror.us> - 1.4.2-1

+ - Fixes a regression in the 1.4.1 release that would cause

+   docker-compose up without the -d option to exit immediately.

+ 

+ * Wed Sep 16 2015 Michael Hampton <error@ioerror.us> - 1.4.1-1

+ - Update to upstream 1.4.1

+ 

+ * Wed Aug 12 2015 Michael Hampton <error@ioerror.us> - 1.4.0-1

+ - Update to upstream 1.4.0

+ - Update Summary to match upstream summary

+ 

+ * Sat May 16 2015 Michael Hampton <error@ioerror.us> - 1.2.0-3

+ - Update Obsoletes EVR per packaging guidelines BZ#1213111

+ 

+ * Sun Apr 19 2015 Michael Hampton <error@ioerror.us> - 1.2.0-2

+ - Update location of LICENSE file

+ 

+ * Sat Apr 18 2015 Michael Hampton <error@ioerror.us> - 1.2.0-1

+ - Update to 1.2.0

+ - Added new doc SWARM.md

+ - Removed docker package requires as it is not required to build or run the

+   package, only to run tests, which we can't do anyway

+ - Removed commented code relating to running tests, which we can't do anyway

+ - Made package noarch as docker-io is no longer required

+ 

+ * Mon Mar 23 2015 Michael Hampton <error@ioerror.us> - 1.1.0-1

+ - Update to 1.1.0 including upstream name change

+ - Requires python-dockerpty

+ - Requires python-docker-py >= 0.7.1-3 BZ#1197300

+ 

+ * Tue Mar 17 2015 Matej Stuchlik <mstuchli@redhat.com> - 1.0.1-2

+ - Completely remove version specs from setup.py

+ 

+ * Tue Mar 17 2015 Matej Stuchlik <mstuchli@redhat.com> - 1.0.1-1

+ - Update to 1.0.1

+ 

+ * Wed Dec 03 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-5

+ - Remove upper bound from setup.py requires

+ 

+ * Wed Nov 12 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-4

+ - Add python-setuptools to requires

+ 

+ * Thu Oct 23 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-3

+ - Relax strict version requirements on websocket-client (#1155510)

+ 

+ * Tue Oct 21 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-2

+ - Update Requires

+ 

+ * Tue Oct 21 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-1

+ - Update to 1.0.0

+ - Droped the two patches

+ 

+ * Tue Oct 21 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.5.2-2

+ - Explicitly disable debuginfo subpackage (#1154780)

+ - Add python-docker-py to Requires (#1154874)

+ 

+ * Thu Oct 09 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.5.2-1

+ - Initial spec based on rhbz#1129889

file modified
+48 -385
@@ -1,407 +1,70 @@ 

- Name:           docker-compose

- Version:        1.29.2

- Release:        12%{?dist}

- Summary:        Multi-container orchestration for Docker

- License:        ASL 2.0

- URL:            https://github.com/docker/compose

- Source0:        %pypi_source

- BuildArch:      noarch

- 

- Patch:          pytest-7.2-compatibility.patch

- 

- BuildRequires:  python%{python3_pkgversion}-devel

- BuildRequires:  python%{python3_pkgversion}-setuptools

- BuildRequires:  python%{python3_pkgversion}-pytest

- BuildRequires:  python%{python3_pkgversion}-distro

- BuildRequires:  python%{python3_pkgversion}-dotenv

- BuildRequires:  python%{python3_pkgversion}-ddt

- 

- BuildRequires:  python%{python3_pkgversion}-cached_property >= 1.5.1

- BuildRequires:  python%{python3_pkgversion}-chardet >= 3.0.4

- BuildRequires:  python%{python3_pkgversion}-distro >= 1.5.0

- BuildRequires:  python%{python3_pkgversion}-docker >= 5.0.0

- BuildRequires:  python%{python3_pkgversion}-docker-pycreds >= 0.4.0

- BuildRequires:  python%{python3_pkgversion}-dockerpty >= 0.4.1

- BuildRequires:  python%{python3_pkgversion}-docopt >= 0.6.2

- BuildRequires:  python%{python3_pkgversion}-idna >= 2.10

- BuildRequires:  python%{python3_pkgversion}-jsonschema >= 3.2.0

- BuildRequires:  python%{python3_pkgversion}-pysocks >= 1.7.1

- BuildRequires:  python%{python3_pkgversion}-requests >= 2.24.0

- BuildRequires:  python%{python3_pkgversion}-six >= 1.12.0

- BuildRequires:  python%{python3_pkgversion}-texttable >= 1.6.2

- BuildRequires:  python%{python3_pkgversion}-websocket-client >= 0.57.0

- BuildRequires:  python%{python3_pkgversion}-yaml >= 5.4.1

+ # Generated by go2rpm 1.11.0

+ %bcond_without check

  

- Requires:       python%{python3_pkgversion}-setuptools

+ # https://github.com/docker/compose/v2

+ %global goipath         github.com/docker/compose/v2

+ Version:                2.26.0

  

- Requires:       python%{python3_pkgversion}-cached_property >= 1.5.1

- Requires:       python%{python3_pkgversion}-chardet >= 3.0.4

- Requires:       python%{python3_pkgversion}-distro >= 1.5.0

- Requires:       python%{python3_pkgversion}-docker >= 5.0.0

- Requires:       python%{python3_pkgversion}-docker-pycreds >= 0.4.0

- Requires:       python%{python3_pkgversion}-dockerpty >= 0.4.1

- Requires:       python%{python3_pkgversion}-docopt >= 0.6.2

- Requires:       python%{python3_pkgversion}-idna >= 2.10

- Requires:       python%{python3_pkgversion}-jsonschema >= 3.2.0

- Requires:       python%{python3_pkgversion}-pysocks >= 1.7.1

- Requires:       python%{python3_pkgversion}-requests >= 2.24.0

- Requires:       python%{python3_pkgversion}-six >= 1.12.0

- Requires:       python%{python3_pkgversion}-texttable >= 1.6.2

- Requires:       python%{python3_pkgversion}-websocket-client >= 0.57.0

- Requires:       python%{python3_pkgversion}-yaml >= 5.4.1

+ %gometa -L -f

  

- Requires:       python%{python3_pkgversion}-attrs >= 20.3.0

- Requires:       python%{python3_pkgversion}-certifi >= 2020.6.20

+ %global common_description %{expand:

+ Define and run multi-container applications with Docker.}

  

+ Name:           docker-compose

+ Release:        %autorelease

+ Summary:        Define and run multi-container applications with Docker

  

- %description

- Compose is a tool for defining and running multi-container Docker

- applications. With Compose, you use a Compose file to configure your

- application's services. Then, using a single command, you create and

- start all the services from your configuration.

+ # Generated by go-vendor-tools

+ License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0

+ URL:            %{gourl}

+ Source0:        %{gosource}

+ # Generated by go-vendor-tools

+ Source1:        %{archivename}-vendor.tar.bz2

+ Source2:        go-vendor-tools.toml

  

- Compose is great for development, testing, and staging environments,

- as well as CI workflows.

+ BuildRequires:  go-vendor-tools

+ BuildRequires:  make

+ BuildRequires:  moby-rpm-macros

  

- Using Compose is basically a three-step process.

+ Requires:       docker-cli

+ # Provides /usr/bin/docker-compose wrapper for backwards compatibility

+ Requires:       docker-compose-switch

  

- 1. Define your app's environment with a Dockerfile so it can be

-    reproduced anywhere.

- 2. Define the services that make up your app in docker-compose.yml so

-    they can be run together in an isolated environment:

- 3. Lastly, run docker-compose up and Compose will start and run your

-    entire app.

+ # Conflict with upstream package

+ Conflicts:      docker-compose-plugin

  

+ %description %{common_description}

  

  %prep

- %autosetup -p 1

- rm -rf docker_compose.egg-info

- 

- # Remove dependency version constraints not relevant in Fedora/EPEL

- sed -e 's/, < [0-9.]\+//' -i setup.py

+ %goprep -A

+ %setup -q -T -D -a1 %{forgesetupargs}

+ %autopatch -p1

  

+ %generate_buildrequires

+ %go_vendor_license_buildrequires -c %{S:2}

  

  %build

- %py3_build

- 

+ export GO_LDFLAGS="-X %{goipath}/internal.Version=%{version}"

+ %gobuild -o %{gobuilddir}/bin/docker-compose %{goipath}/cmd

  

  %install

- %py3_install

- install -D -p -m 644 contrib/completion/bash/docker-compose %{buildroot}%{_datadir}/bash-completion/completions/docker-compose

- install -D -p -m 644 contrib/completion/zsh/_docker-compose %{buildroot}%{_datadir}/zsh/site-functions/_docker-compose

- install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/docker-compose.fish

- 

+ %go_vendor_license_install -c %{S:2}

+ install -Dpm 0755 \

+     %{gobuilddir}/bin/docker-compose \

+     %{buildroot}%{moby_cli_plugins_dir}/docker-compose

  

  %check

- PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} --verbose tests/unit

- 

+ %go_vendor_license_check -c %{S:2}

+ %if %{with check}

+ # e2e tests require external services

+ %gocheck -t pkg/e2e

+ %endif

  

- %files

- %license LICENSE

- %doc CHANGELOG.md README.md

- %{_bindir}/%{name}

- %{python3_sitelib}/compose

- %{python3_sitelib}/docker_compose-%{version}-py%{python3_version}.egg-info

- %{_datadir}/bash-completion

- %{_datadir}/zsh

- %{_datadir}/fish

+ %files -f %{go_vendor_license_filelist}

+ %license vendor/modules.txt

+ %doc README.md

+ %{moby_cli_plugins_dir}/docker-compose

  

  

  %changelog

- * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-12

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

- 

- * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-11

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

- 

- * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-10

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

- 

- * Fri Jun 30 2023 Python Maint <python-maint@redhat.com> - 1.29.2-9

- - Rebuilt for Python 3.12

- 

- * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-8

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

- 

- * Wed Nov 16 2022 Lumír Balhar <lbalhar@redhat.com> - 1.29.2-7

- - Fix compatibility with pytest 7.2

- 

- * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-6

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

- 

- * Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 1.29.2-5

- - Rebuilt for Python 3.11

- 

- * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-4

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

- 

- * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.29.2-3

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

- 

- * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.29.2-2

- - Rebuilt for Python 3.10

- 

- * Mon May 10 2021 Michael Hampton <error@ioerror.us> - 1.29.2-1

- - Update to 1.29.2

- 

- * Wed Apr 21 2021 Michael Hampton <error@ioerror.us> - 1.29.1-1

- - Rebase to 1.29.1

- 

- * Mon Mar 29 2021 Michael Hampton <error@ioerror.us> - 1.28.6-1

- - Rebase to 1.28.6

- 

- * Fri Feb 26 2021 Michael Hampton <error@ioerror.us> - 1.28.5-1

- - Rebase to 1.28.5

- 

- * Fri Feb 19 2021 Michael Hampton <error@ioerror.us> - 1.28.4-1

- - Rebase to 1.28.4

- 

- * Wed Jan 27 2021 Michael Hampton <error@ioerror.us> - 1.28.2-1

- - Rebase to 1.28.2

- 

- * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.0-2

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

- 

- * Wed Jan 20 2021 Michael Hampton <error@ioerror.us> - 1.28.0-1

- - Rebase to 1.28.0

- 

- * Thu Sep 24 2020 Michael Hampton <error@ioerror.us> - 1.27.4-1

- - Rebase to 1.27.4

- 

- * Wed Sep 16 2020 Michael Hampton <error@ioerror.us> - 1.27.3-2

- - Requires python-docker 4.3.1

- 

- * Wed Sep 16 2020 Michael Hampton <error@ioerror.us> - 1.27.3-1

- - Rebase to 1.27.3

- 

- * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.4-3

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

- 

- * Tue Jul 14 2020 Michael Hampton <error@ioerror.us> - 1.26.2-1

- - Rebase to 1.26.2

- - Add python-distro build dependency

- - Add python-dotenv build dependency

- 

- * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.25.4-2

- - Rebuilt for Python 3.9

- 

- * Mon Mar 23 2020 Michael Hampton <error@ioerror.us> - 1.25.4-2

- - Remove patch for BZ#1705955 it is now in upstream source

- - Add python-ddt build dependency

- 

- * Sat Feb 29 2020 Michael Hampton <error@ioerror.us> - 1.25.4-1

- - Rebase to 1.25.4

- 

- * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.1-4

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

- 

- * Mon Oct  7 2019 Michael Hampton <error@ioerror.us> - 1.24.1-3

- - Require python-docker 4.0.2-2 for ssh feature

- 

- * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.24.1-2

- - Rebuilt for Python 3.8.0rc1 (#1748018)

- 

- * Tue Sep 17 2019 Michael Hampton <error@ioerror.us> - 1.24.1-2

- - Require python-docker 4.0.2 for ssh feature

- 

- * Wed Aug 28 2019 Michael Hampton <error@ioerror.us> - 1.24.1-1

- - Rebase to 1.24.1 (BZ#1691898)

- - Patch tests for pytest 5 compatibility (BZ#1705955)

- 

- * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.22.0-6

- - Rebuilt for Python 3.8

- 

- * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-5

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

- 

- * Wed Jul 10 2019 Michael Hampton <error@ioerror.us> - 1.22.0-4

- 

- * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

- 

- * Mon Oct 08 2018 Carl George <carl@george.computer> - 1.22.0-2

- - Run upstream unit tests

- 

- * Wed Jul 18 2018 Michael Hampton <error@ioerror.us> - 1.22.0-1

- - Update to 1.22.0

- 

- * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.1-3

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

- 

- * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.20.1-2

- - Rebuilt for Python 3.7

- 

- * Tue Mar 27 2018 Michael Hampton <error@ioerror.us> - 1.20.1-1

- - Update to 1.20.1

- 

- * Wed Mar 21 2018 Michael Hampton <error@ioerror.us> - 1.20.0-1

- - Update to 1.20.0

- 

- * Fri Mar 02 2018 Adam Williamson <awilliam@redhat.com> - 1.19.0-2

- - Backport upstream patch for compatibility with python-docker 3.0.0

- 

- * Mon Feb 19 2018 Michael Hampton <error@ioerror.us> - 1.19.0-1

- - Update to 1.19.0

- 

- * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

- 

- * Tue Dec 26 2017 Carl George <carl@george.computer> - 1.18.0-1

- - Latest upstream

- - Drop patch0 and patch1, use sed on setup.py instead

- - Rebase patch2

- 

- * Thu Nov  9 2017 Michael Hampton <error@ioerror.us> - 1.17.1-1

- - Update to 1.17.1 (#1511455)

- 

- * Thu Nov  2 2017 Michael Hampton <error@ioerror.us> - 1.17.0-1

- - Update to 1.17.0 (#1504337)

- 

- * Sun Sep 10 2017 Carl George <carl@george.computer> - 1.16.1-2

- - Align dependencies with upstream

- - RHEL compatibility

- - Add bash, zsh, and fish completions

- 

- * Sat Sep  2 2017 Michael Hampton <error@ioerror.us> - 1.16.1-1

- - Update to 1.16.1 (#1483776)

- 

- * Fri Jul 28 2017 Michael Hampton <error@ioerror.us> - 1.15.0-1

- - Update to 1.15.0 (#1471093)

- - Explicit python3-docker requirement

- - New upstream requirements python3-pysocks, python3-certifi, python3-idna

- 

- * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-2

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

- 

- * Tue Jun 20 2017 Michael Hampton <error@ioerror.us> - 1.14.0-1

- - Update to upstream 1.14.0

- 

- * Mon May  8 2017 Michael Hampton <error@ioerror.us> - 1.13.0-1

- - Update to upstream 1.13.0

- 

- * Fri Apr  7 2017 Michael Hampton <error@ioerror.us> - 1.12.0-1

- - Update to upstream 1.12.0

- 

- * Thu Mar  2 2017 Michael Hampton <error@ioerror.us> - 1.11.2-1

- - Update to upstream 1.11.2

- 

- * Tue Feb 28 2017 Michael Hampton <error@ioerror.us> - 1.11.1-3

- - Remove requirements upper bound from setup.py; BZ#1426145

- - Added new dependency python3-colorama

- 

- * Fri Feb 17 2017 Michael Hampton <error@ioerror.us> - 1.11.1-2

- - python-docker-py package name changed to python-docker; BZ#1422198

- 

- * Fri Feb 10 2017 Michael Hampton <error@ioerror.us> - 1.11.1-1

- - Update to upstream 1.11.1

- 

- * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-2

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

- 

- * Fri Feb  3 2017 Michael Hampton <error@ioerror.us> - 1.10.1-1

- - Update to upstream 1.10.1

- 

- * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.9.0-3

- - Rebuild for Python 3.6

- 

- * Mon Nov 21 2016 Michael Hampton <error@ioerror.us> - 1.9.0-2

- - BZ#1396852

- 

- * Sat Nov 19 2016 Michael Hampton <error@ioerror.us> - 1.9.0-1

- - Update to upstream 1.9.0

- 

- * Fri Sep 23 2016 Michael Hampton <error@ioerror.us> - 1.8.1-1

- - Update to upstream 1.8.1

- 

- * Sat Sep 10 2016 Michael Hampton <error@ioerror.us> - 1.8.0-2

- - Port to Python 3, BZ#1374656

- 

- * Thu Jul 28 2016 Michael Hampton <error@ioerror.us> - 1.8.0-1

- - Update to upstream 1.8.0

- 

- * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-2

- - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

- 

- * Thu May 05 2016 Michael Hampton <error@ioerror.us> - 1.7.1-1

- - Update to upstream 1.7.1

- - Updated package description from upstream

- 

- * Thu Apr 14 2016 Michael Hampton <error@ioerror.us> - 1.7.0-1

- - Update to upstream 1.7.0

- 

- * Fri Feb 05 2016 Michael Hampton <error@ioerror.us> - 1.6.0-1

- - Update to upstream 1.6.0

- 

- * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-5

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

- 

- * Tue Jan 12 2016 Michael Hampton <error@ioerror.us> - 1.5.2-4

- - Added missing dependency python-enum34

- 

- * Mon Jan 11 2016 Michael Hampton <error@ioerror.us> - 1.5.2-3

- - Added missing dependency python-jsonschema

- 

- * Wed Dec 30 2015 Michael Hampton <error@ioerror.us> - 1.5.2-2

- - Updated locations of docs

- 

- * Wed Dec 30 2015 Michael Hampton <error@ioerror.us> - 1.5.2-1

- - Update to upstream 1.5.2

- 

- * Wed Sep 23 2015 Michael Hampton <error@ioerror.us> - 1.4.2-1

- - Fixes a regression in the 1.4.1 release that would cause

-   docker-compose up without the -d option to exit immediately.

- 

- * Wed Sep 16 2015 Michael Hampton <error@ioerror.us> - 1.4.1-1

- - Update to upstream 1.4.1

- 

- * Wed Aug 12 2015 Michael Hampton <error@ioerror.us> - 1.4.0-1

- - Update to upstream 1.4.0

- - Update Summary to match upstream summary

- 

- * Sat May 16 2015 Michael Hampton <error@ioerror.us> - 1.2.0-3

- - Update Obsoletes EVR per packaging guidelines BZ#1213111

- 

- * Sun Apr 19 2015 Michael Hampton <error@ioerror.us> - 1.2.0-2

- - Update location of LICENSE file

- 

- * Sat Apr 18 2015 Michael Hampton <error@ioerror.us> - 1.2.0-1

- - Update to 1.2.0

- - Added new doc SWARM.md

- - Removed docker package requires as it is not required to build or run the

-   package, only to run tests, which we can't do anyway

- - Removed commented code relating to running tests, which we can't do anyway

- - Made package noarch as docker-io is no longer required

- 

- * Mon Mar 23 2015 Michael Hampton <error@ioerror.us> - 1.1.0-1

- - Update to 1.1.0 including upstream name change

- - Requires python-dockerpty

- - Requires python-docker-py >= 0.7.1-3 BZ#1197300

- 

- * Tue Mar 17 2015 Matej Stuchlik <mstuchli@redhat.com> - 1.0.1-2

- - Completely remove version specs from setup.py

- 

- * Tue Mar 17 2015 Matej Stuchlik <mstuchli@redhat.com> - 1.0.1-1

- - Update to 1.0.1

- 

- * Wed Dec 03 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-5

- - Remove upper bound from setup.py requires

- 

- * Wed Nov 12 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-4

- - Add python-setuptools to requires

- 

- * Thu Oct 23 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-3

- - Relax strict version requirements on websocket-client (#1155510)

- 

- * Tue Oct 21 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-2

- - Update Requires

- 

- * Tue Oct 21 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.0.0-1

- - Update to 1.0.0

- - Droped the two patches

- 

- * Tue Oct 21 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.5.2-2

- - Explicitly disable debuginfo subpackage (#1154780)

- - Add python-docker-py to Requires (#1154874)

- 

- * Thu Oct 09 2014 Matej Stuchlik <mstuchli@redhat.com> - 0.5.2-1

- - Initial spec based on rhbz#1129889

+ %autochangelog

@@ -0,0 +1,7 @@ 

+ [licensing]

+ detector = "trivy"

+ 

+ [[licensing.licenses]]

+ path = "vendor/github.com/google/shlex/COPYING"

+ sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30"

+ expression = "Apache-2.0"

@@ -1,53 +0,0 @@ 

- From a277e6101828afa58b4b602c4e402259889de81b Mon Sep 17 00:00:00 2001

- From: Lumir Balhar <lbalhar@redhat.com>

- Date: Wed, 16 Nov 2022 07:45:03 +0100

- Subject: [PATCH] pytest 7.2 compatibility

- 

- ---

-  tests/unit/cli_test.py | 17 ++++++++++++++---

-  1 file changed, 14 insertions(+), 3 deletions(-)

- 

- diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py

- index fa6e767..3d766e8 100644

- --- a/tests/unit/cli_test.py

- +++ b/tests/unit/cli_test.py

- @@ -1,10 +1,11 @@

- +import contextlib

-  import os

-  import shutil

-  import tempfile

-  from io import StringIO

- +from pathlib import Path

-  

-  import docker

- -import py

-  import pytest

-  from docker.constants import DEFAULT_DOCKER_API_VERSION

-  

- @@ -23,11 +24,21 @@ from compose.container import Container

-  from compose.project import Project

-  

-  

- +@contextlib.contextmanager

- +def working_directory(path):

- +    cwd = Path.cwd()

- +    os.chdir(path)

- +    try:

- +        yield

- +    finally:

- +        os.chdir(cwd)

- +

- +

-  class CLITestCase(unittest.TestCase):

-  

-      def test_default_project_name(self):

- -        test_dir = py._path.local.LocalPath('tests/fixtures/simple-composefile')

- -        with test_dir.as_cwd():

- +        test_dir = Path('tests/fixtures/simple-composefile')

- +        with working_directory(test_dir):

-              project_name = get_project_name('.')

-              assert 'simple-composefile' == project_name

-  

- -- 

- 2.38.1

- 

file modified
+2 -1
@@ -1,1 +1,2 @@ 

- SHA512 (docker-compose-1.29.2.tar.gz) = fdb1c220b4ae5bc6e7a29fbf408a899552a9b2a3fc558f53fe4e0afe881dc6f2d26147bc0e8ac8f14ab918baa18c6fb277c06bbb0d9486fcc9135fcc03c08abb

+ SHA512 (compose-2.26.0.tar.gz) = 8a3d8fb8c6812e85bdaebbcfb7a4976df46271e69fb4d7e9bc7af78c39833195d113dfb8e155f5c4b4f30f86e17a823989cb35a966069123e53779eb58a9ab38

+ SHA512 (compose-2.26.0-vendor.tar.bz2) = 05b5ca1bd17410c9f214eb93fb7efeafe9744d7c55c076a1ce78d49f49375991f13c5f08306bdbdba31c3ef2a9f9f1d757a14251e4c11fb084a83e0a36fe0006

This updates docker-compose to v2 as part of the docker-ng packaging effort. It depends on the new docker-compose-switch package (https://bugzilla.redhat.com/show_bug.cgi?id=2274654) to provide the /usr/bin/docker-compose shim for backwards compatibility.

Ref: https://lists.fedoraproject.org/archives/list/golang@lists.fedoraproject.org/thread/K5P6P2MGEE3SCPF4SZFWOIUGHQHJ6GGG/

/cc @sergiomb @buckaroogeek

2 new commits added

  • Update to 2.26.0. Fixes rhbz#2000794.
  • Convert to %autorelease and %autochangelog
2 months ago

@gotmax23 thank you Maxwell for working on this!

I'd like to transfer the ownership to you once this gets merged since you did all the work and have experience with go packaging. Mine is very limited.

https://github.com/fedora-copr/copr/pull/3288

you need to install the docker-compose-plugin package

from the docker-ce repository

sudo dnf remove docker \
                  docker-client \
                  docker-client-latest \
                  docker-common \
                  docker-latest \
                  docker-latest-logrotate \
                  docker-logrotate \
                  docker-selinux \
                  docker-engine-selinux \
                  docker-engine \
                  docker-compose
sudo dnf -y install dnf-plugins-core
sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
 sudo dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin

I use https://copr.fedorainfracloud.org/coprs/gotmax23/docker-ng , but still need set export BUILDKITSOMETHING=0 in my copr server