diff --git a/.gitignore b/.gitignore index 9bab1aa..62696a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/docker-py-dc164c71be59e9d905a79db33aa77ba45e2ece2b.tar.gz +SOURCES/docker-py-997e583ea9a7b33113edd91d5bee73d25d720448.tar.gz +SOURCES/docker-pycreds-0.2.1.tar.gz diff --git a/.python-docker-py.metadata b/.python-docker-py.metadata index 2f56ea7..b62bec8 100644 --- a/.python-docker-py.metadata +++ b/.python-docker-py.metadata @@ -1 +1,2 @@ -8a750664b9970cd544c3cbb409038aed4d7042b1 SOURCES/docker-py-dc164c71be59e9d905a79db33aa77ba45e2ece2b.tar.gz +048614198d1f15fcc1c95c1e55507dc53ce10fc0 SOURCES/docker-py-997e583ea9a7b33113edd91d5bee73d25d720448.tar.gz +02e65f3b4a75bd65cd4c312835961d3551967454 SOURCES/docker-pycreds-0.2.1.tar.gz diff --git a/SOURCES/setup-Neuter-extras_require-that-doesn-t-work-on-Cen.patch b/SOURCES/setup-Neuter-extras_require-that-doesn-t-work-on-Cen.patch new file mode 100644 index 0000000..5f18e66 --- /dev/null +++ b/SOURCES/setup-Neuter-extras_require-that-doesn-t-work-on-Cen.patch @@ -0,0 +1,41 @@ +From 3eeef7b62131a1dbcbb2758eb9eb382578ddd0fb Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Tue, 3 May 2016 16:35:24 +0200 +Subject: [PATCH] setup: Neuter extras_require that doesn't work on CentOS 7 + +I think the version of python-setuputils is too old or something. +--- + setup.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup.py b/setup.py +index fac5129..6a7e03c 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,10 +17,10 @@ requirements = [ + if sys.platform == 'win32': + requirements.append('pypiwin32 >= 219') + +-extras_require = { +- ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5', +- ':python_version < "3.3"': 'ipaddress >= 1.0.16', +-} ++# extras_require = { ++# ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5', ++# ':python_version < "3.3"': 'ipaddress >= 1.0.16', ++# } + + version = None + exec(open('docker/version.py').read()) +@@ -33,7 +33,7 @@ setup( + ], + install_requires=requirements, + tests_require=test_requirements, +- extras_require=extras_require, ++ # extras_require=extras_require, + zip_safe=False, + test_suite='tests', + classifiers=[ +-- +2.4.11 + diff --git a/SPECS/python-docker-py.spec b/SPECS/python-docker-py.spec index f6fe82b..3a86ca9 100644 --- a/SPECS/python-docker-py.spec +++ b/SPECS/python-docker-py.spec @@ -1,23 +1,19 @@ -%if 0%{?fedora} -%global with_python3 0 -%endif #fedora - -# disable debug package cause archful -%global debug_package %{nil} - %global owner docker %global project docker-py -%global commit dc164c71be59e9d905a79db33aa77ba45e2ece2b +%global commit 997e583ea9a7b33113edd91d5bee73d25d720448 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global docker_pycreds_pypi_name docker-pycreds +%global docker_pycreds_version 0.2.1 Name: python-%{project} -Version: 1.9.0 +Version: 1.10.6 Release: 1%{?dist} Summary: An API client for docker written in Python License: ASL 2.0 URL: https://github.com/%{owner}/%{project}/ Source0: https://github.com/%{owner}/%{project}/archive/%{commit}/%{project}-%{commit}.tar.gz Patch1: remote-inspection.patch +Patch2: setup-Neuter-extras_require-that-doesn-t-work-on-Cen.patch BuildArch: noarch BuildRequires: python2-devel @@ -26,15 +22,9 @@ BuildRequires: python-setuptools Requires: python-requests Requires: python-websocket-client >= 0.32.0 Requires: python-six >= 1.4.0 - -%if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-tools -BuildRequires: python3-setuptools -BuildRequires: python3-requests -BuildRequires: python3-websocket-client >= 0.11.0 -BuildRequires: python3-coverage >= 3.7.1 -%endif # with_python3 +Requires: python-ipaddress +Requires: python-backports-ssl_match_hostname +Requires: python-docker-pycreds Obsoletes: docker-python <= 1.4.0-115.x86_64 Provides: docker-python == %{version}-%{release} @@ -42,51 +32,38 @@ Provides: docker-python == %{version}-%{release} %description %{summary} -%if 0%{?with_python3} -%package -n python3-docker-py -Requires: python3-websocket-client >= 0.11.0 -Requires: python3-requests -Requires: python3-six >= 1.3.0 -Summary: An API client for docker written in Python 3 -%description -n python3-docker-py -A Python 3 interface to Docker -%endif # with_python3 +%package -n python-docker-pycreds +Summary: Python bindings for the docker credentials store API +License: ASL 2.0 +URL: https://github.com/shin-/dockerpy-creds/ +Source1: https://files.pythonhosted.org/packages/source/d/%{docker_pycreds_pypi_name}/%{docker_pycreds_pypi_name}-%{docker_pycreds_version}.tar.gz +BuildArch: noarch +Requires: python-six + +%description -n python-docker-pycreds +Python bindings for the docker credentials store API + %prep %setup -q -n %{project}-%{commit} -sed -i '/python_version/d' setup.py -#%%patch1 -p 1 - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -pushd %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' -popd -%endif # with_python3 +%patch1 -p 1 +%patch2 -p 1 +gzip -dc %{SOURCE1} | tar -xvvf - + %build %{__python} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build +pushd %{docker_pycreds_pypi_name}-%{docker_pycreds_version} +%{__python} setup.py build popd -%endif # with_python3 + %install %{__python} setup.py install --root %{buildroot} - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --root %{buildroot} +pushd %{docker_pycreds_pypi_name}-%{docker_pycreds_version} +%{__python} setup.py install --root %{buildroot} popd -%endif # with_python3 - -%check -# we need pytest and a bunch of packages which are not available in RHEL -# PYTHONPATH="${PWD}" py.test-%%{python2_version} tests/unit/ %files @@ -94,16 +71,17 @@ popd %{python_sitelib}/docker %{python_sitelib}/docker_py-%{version}* -%if 0%{?with_python3} -%files -n python3-docker-py -%doc LICENSE README.md -%dir %{python3_sitelib}/docker -%dir %{python3_sitelib}/docker_py-%{version}-py3*.egg-info -%{python3_sitelib}/docker/* -%{python3_sitelib}/docker_py-%{version}-py3*.egg-info/* -%endif # with_python3 + +%files -n python-docker-pycreds +%doc %{docker_pycreds_pypi_name}-%{docker_pycreds_version}/LICENSE %{docker_pycreds_pypi_name}-%{docker_pycreds_version}/README.md +%{python_sitelib}/dockerpycreds +%{python_sitelib}/docker_pycreds-%{docker_pycreds_version}* + %changelog +* Tue Dec 20 2016 Tomas Tomecek - 1.10.6-1 +- update to 1.10.6 + * Wed Sep 07 2016 Lokesh Mandvekar - 1.9.0-1 - Resolves: #1374058 - rebase to upstream 1.9.0