#27 Add docker[ssh] subpackage
Merged 9 months ago by ttomecek. Opened 9 months ago by churchyard.
rpms/ churchyard/python-docker extras  into  master

file modified
+7 -25
@@ -15,7 +15,7 @@ 

  

  Name:           python-%{srcname}

  Version:        4.2.1

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        A Python library for the Docker Engine API

  License:        ASL 2.0

  URL:            https://pypi.org/project/%{srcname}
@@ -34,17 +34,6 @@ 

  

  BuildRequires:  python2-devel

  BuildRequires:  python%{?fedora:2}-setuptools

- Requires:       python%{?fedora:2}-requests >= 2.14.2

- Requires:       python%{?fedora:2}-six >= 1.4.0

- Requires:       python%{?fedora:2}-websocket-client >= 0.32.0

- Requires:       python%{?fedora:2}-docker-pycreds >= 0.2.1

- Requires:       python%{?fedora:2}-backports-ssl_match_hostname >= 3.5

- Requires:       python%{?fedora:2}-ipaddress >= 1.0.16

- Requires:       python%{?fedora:2}-pyOpenSSL

- Requires:       python%{?fedora:2}-idna

- Requires:       python%{?fedora:2}-cryptography

- Requires:       python%{?fedora:2}-paramiko

- 

  Obsoletes:      python-docker-py < 1:2

  

  %description -n python2-%{srcname}
@@ -69,26 +58,15 @@ 

  

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

- Requires:       python3-requests >= 2.14.2

- Requires:       python3-six >= 1.4.0

- Requires:       python3-websocket-client >= 0.32.0

- Requires:       python3-docker-pycreds >= 0.2.1

- Requires:       python3-pyOpenSSL

- Requires:       python3-idna

- Requires:       python3-cryptography

- Requires:       python3-paramiko

- 

- %if 0%{?fedora} >= 26

  Obsoletes:      python3-docker-py < 1:2

- %else

- Obsoletes:      python3-docker-py < 2

- %endif

  

  %description -n python3-%{srcname}

  It lets you do anything the docker command does, but from within Python apps –

  run containers, manage containers, manage Swarms, etc.

  %endif # with_python3

  

+ %{?python_extras_subpkg:%python_extras_subpkg -n python3-%{srcname} -i %{python3_sitelib}/*.egg-info ssh}

+ 

  %prep

  %setup -n %{srcname}-%{version}

  rm -fr docker.egg-info
@@ -138,6 +116,10 @@ 

  %endif # tests

  

  %changelog

+ * Fri Jul 10 2020 Miro Hrončok <mhroncok@redhat.com> - 4.2.1-2

+ - Add docker[ssh] subpackage

+ - Drop all manual requires

+ 

  * Thu Jun 18 2020 Tomas Tomecek <ttomecek@redhat.com> - 4.2.1-1

  - new upstream release: 4.2.1

  

python3-docker requires:

((python3.9dist(requests) < 2.18 or python3.9dist(requests) > 2.18) with python3.9dist(requests) >= 2.14.2)
python3.9dist(six) >= 1.4
python3.9dist(websocket-client) >= 0.32

python3-docker+ssh requires:

python3.9dist(paramiko) >= 2.4.2

I believe we could remove the manual requires:

Requires:       python3-requests >= 2.14.2
Requires:       python3-six >= 1.4.0
Requires:       python3-websocket-client >= 0.32.0
Requires:       python3-docker-pycreds >= 0.2.1
Requires:       python3-pyOpenSSL
Requires:       python3-idna
Requires:       python3-cryptography
Requires:       python3-paramiko

Because they should not be needed. The python3-docker+ssh package can be recommened from python3-docker. Let me know if I shall proceed with those changes.

LGTM, thank you, Miro!

Feel free to drop those Requires, also we probably don't need to recommend the subpackage since to me the -ssh transport is used rarely.

1 new commit added

  • Drop all manual requires
9 months ago

lovely, thank you so much!

Pull-Request has been merged by ttomecek

9 months ago