Hello community, here is the log from the commit of package docker-compose for openSUSE:Factory checked in at 2018-05-08 13:40:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker-compose (Old) and /work/SRC/openSUSE:Factory/.docker-compose.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose" Tue May 8 13:40:12 2018 rev:13 rq:605287 version:1.21.2 Changes: -------- --- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes 2017-12-23 12:21:30.605662833 +0100 +++ /work/SRC/openSUSE:Factory/.docker-compose.new/docker-compose.changes 2018-05-08 13:40:58.981663193 +0200 @@ -1,0 +2,31 @@ +Tue May 8 10:25:48 UTC 2018 - [email protected] + +- Fix typos in py2 requirements + +------------------------------------------------------------------- +Tue May 8 09:11:37 UTC 2018 - [email protected] + +- Execute the pytest testsuite, fixes bsc#1091133 + +------------------------------------------------------------------- +Tue May 8 09:02:46 UTC 2018 - [email protected] + +- Add back patch fix-requirements.patch as it really was needed in + the end + +------------------------------------------------------------------- +Mon May 7 17:51:24 UTC 2018 - [email protected] + +- Update to version 1.21.2: + * Many many changes from 1.17.0 read CHANGES.md file +- Drop README.SUSE pointing to same stuff like official readme +- Drop patch fix-requirements.patch as it is not really needed +- Switch to singlespec approach building both py2 and py3 + * pick just py3 binary, no real reason to keep py2 variant + +------------------------------------------------------------------- +Mon May 7 17:51:10 UTC 2018 - [email protected] + +- Drop service, it is not really needed as we fetch from pypi + +------------------------------------------------------------------- Old: ---- README.SUSE _service _servicedata compose-1.17.0.tar.xz New: ---- 1.21.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-compose.spec ++++++ --- /var/tmp/diff_new_pack.zLJ1k3/_old 2018-05-08 13:41:00.249617421 +0200 +++ /var/tmp/diff_new_pack.zLJ1k3/_new 2018-05-08 13:41:00.253617276 +0200 @@ -1,7 +1,7 @@ # # spec file for package docker-compose # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,54 +16,56 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define mod_name compose - Name: docker-compose -Version: 1.17.0 +Version: 1.21.2 Release: 0 Summary: Define and run complex applications using Docker License: Apache-2.0 Group: System/Management -Url: https://pypi.python.org/pypi/docker-compose -Source0: %{mod_name}-%{version}.tar.xz -Source1: README.SUSE +URL: https://pypi.python.org/pypi/docker-compose +Source0: https://github.com/docker/compose/archive/%{version}.tar.gz Patch0: fix-requirements.patch +BuildRequires: %{python_module PyYAML >= 3.10} +BuildRequires: %{python_module cached-property >= 1.2.0} +BuildRequires: %{python_module dockerpty >= 0.4.1} +BuildRequires: %{python_module docopt >= 0.6.1} +BuildRequires: %{python_module jsonschema >= 2.5.1} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module texttable >= 0.9.0} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: python2-backports.ssl_match_hostname >= 3.5 +BuildRequires: python2-enum34 >= 1.0.4 +BuildRequires: python2-ipaddress >= 1.0.16 +BuildRequires: python2-mock >= 1.0.1 Requires: docker -Requires: python-PySocks >= 1.5.6 -Conflicts: python-PySocks >= 2 -Requires: python-PyYAML >= 3.11 -Conflicts: python-PyYAML >= 4 +Requires: python-PySocks >= 1.6.7 +Requires: python-PyYAML >= 3.10 +Requires: python-cached-property >= 1.2.0 +Requires: python-chardet >= 3.0.4 Requires: python-docker >= 2.5.1 -Conflicts: python-docker >= 3 +Requires: python-docker-pycreds >= 0.2.3 Requires: python-dockerpty >= 0.4.1 -Conflicts: python-dockerpty >= 0.5 Requires: python-docopt >= 0.6.1 -Conflicts: python-docopt >= 0.7 -Requires: python-enum34 >= 1.0 -Conflicts: python-enum34 >= 2 +Requires: python-idna >= 2.5 Requires: python-jsonschema >= 2.5.1 -Conflicts: python-jsonschema >= 3 -Requires: python-requests >= 2.7.0 -# Conflicts: python-requests >= 2.11 -Requires: python-setuptools -Requires: python-six >= 1.7.3 -Conflicts: python-six >= 2 -Requires: python-texttable >= 0.8.1 -#Conflicts: python-texttable >= 0.10 +Requires: python-requests >= 2.18.4 +Requires: python-six >= 1.10.0 +Requires: python-texttable >= 0.9.0 +Requires: python-urllib3 >= 1.21.1 Requires: python-websocket-client >= 0.32.0 -Conflicts: python-websocket-client >= 1.0 -Requires: python-cached-property >= 1.2.0 -Conflicts: python-cached-property >= 2 -Requires: python-ipaddress >= 1.0.16 -BuildRequires: python-setuptools -Requires: python >= 2.7 -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else +Provides: docker-compose = %{version} +Obsoletes: docker-compose < %{version} BuildArch: noarch +%ifpython2 +Requires: python-backports.ssl_match_hostname >= 3.5 +Requires: python-enum34 >= 1.0.4 +Requires: python-ipaddress >= 1.0.16 %endif +%python_subpackages %description Compose is a tool for defining and running complex applications with Docker. @@ -79,20 +81,21 @@ %prep %setup -q -n %{mod_name}-%{version} %patch0 -p1 -cp %{SOURCE1} . %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +%check +%python_expand py.test-%{$python_bin_suffix} -v tests/unit -%files -%defattr(-,root,root,-) -%doc LICENSE README.md CHANGES.md SWARM.md README.SUSE -%{_bindir}/docker-compose -%dir %{python_sitelib}/* -%{python_sitelib}/compose/* -%{python_sitelib}/*egg-info/* +%files %{python_files} +%license LICENSE +%doc README.md CHANGES.md SWARM.md +%python3_only %{_bindir}/docker-compose +%{python_sitelib}/* %changelog ++++++ fix-requirements.patch ++++++ --- /var/tmp/diff_new_pack.zLJ1k3/_old 2018-05-08 13:41:00.301615543 +0200 +++ /var/tmp/diff_new_pack.zLJ1k3/_new 2018-05-08 13:41:00.301615543 +0200 @@ -1,17 +1,17 @@ -Index: compose-1.17.0/setup.py +Index: compose-1.21.2/setup.py =================================================================== ---- compose-1.17.0.orig/setup.py -+++ compose-1.17.0/setup.py +--- compose-1.21.2.orig/setup.py ++++ compose-1.21.2/setup.py @@ -33,8 +33,8 @@ install_requires = [ 'cached-property >= 1.2.0, < 2', 'docopt >= 0.6.1, < 0.7', 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, < 2.12', +- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', - 'texttable >= 0.9.0, < 0.10', + 'requests >= 2.6.1', -+ 'texttable >= 0.8.1', ++ 'texttable >= 0.9.0', 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 2.5.1, < 3.0', + 'docker >= 3.3.0, < 4.0', 'dockerpty >= 0.4.1, < 0.5', @@ -52,7 +52,7 @@ if sys.version_info[:2] < (3, 4): tests_require.append('mock >= 1.0.1') @@ -21,4 +21,4 @@ + ':python_version < "3.4"': ['enum34 >= 1.0.0, < 2'], ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ':python_version < "3.3"': ['ipaddress >= 1.0.16'], - ':sys_platform == "win32"': ['colorama >= 0.3.7, < 0.4'], + ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
