Import python-docker_2.5.1-1.debian.tar.xz

[dgit import tarball python-docker 2.5.1-1 python-docker_2.5.1-1.debian.tar.xz]

15 files changed, 420 insertions, 0 deletions

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c26ccbc
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM tianon/debian-devel
+
+# start by adding just "debian/control" so we can get mk-build-deps with maximum caching
+COPY control /usr/src/python-docker/debian/
+WORKDIR /usr/src/python-docker
+
+# get all the build deps of _this_ package in a nice repeatable way
+RUN apt-get update && mk-build-deps -irt'apt-get --no-install-recommends -yV' debian/control && dpkg-checkbuilddeps
+
+# need our debian/ directory to compile _this_ package
+COPY . /usr/src/python-docker/debian
+
+# go download and unpack our upstream source
+RUN uscan --force-download --verbose --download-current-version
+RUN origtargz --unpack
+
+# tianon is _really_ lazy, and likes a preseeded bash history
+RUN echo 'origtargz --unpack && dpkg-buildpackage -us -uc && lintian -EvIL+pedantic' >> "$HOME/.bash_history"
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..8ee4887
--- /dev/null
+++ b/changelog
@@ -0,0 +1,180 @@
+python-docker (2.5.1-1) unstable; urgency=medium
+
+  * New upstream version 2.5.1
+    - Refresh patches
+  * Pick dependencies from setup.py instead of requirements.txt.
+    Setup.py is the real thing, plus upstream added deps of deps to requirements.txt
+  * Use https for the watch file
+
+ -- Felipe Sateler <fsateler@debian.org>  Sun, 05 Nov 2017 11:00:09 -0300
+
+python-docker (2.4.2-2) unstable; urgency=medium
+
+  [ Thomas Goirand ]
+  * Add Breaks: python-magnum (<< 5.0.0), python-senlin (<< 2.0.0).
+
+  [ Felipe Sateler ]
+  * Add Breaks for docker-compose << 1.10. (Closes: #870003)
+  * Bump Standards Version
+  * Release to unstable (Closes: #850741)
+
+ -- Felipe Sateler <fsateler@debian.org>  Sat, 04 Nov 2017 10:58:35 -0300
+
+python-docker (2.4.2-1) experimental; urgency=medium
+
+  [ Jason Pleau ]
+  * New upstream release
+  * Refresh requirements patch
+  * Update dependencies for new upstream version
+  * Add myself to debian/copyright
+
+  [ Felipe Sateler ]
+  * Do not require pip for building.
+    It is only used to check for docker-py existece,
+    but that doesn't matter in the context of a debian build
+  * Bump standards-version to 4.0.0
+  * Sync dependency versions in python3 and python versions
+  * Bump debhelper compat to 10
+
+ -- Felipe Sateler <fsateler@debian.org>  Sun, 16 Jul 2017 11:58:44 -0400
+
+python-docker (1.9.0-1) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * New upstream release (Closes: #830172)
+  * Dropped
+    d/p/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
+    (Not needed anymore)
+  * Bump required version of python3-websocket to 0.32.0
+  * Standards-Version is 3.9.8 now (no change)
+  * Fixed typo in description
+
+  [ Andreas Henriksson ]
+  * autopkgtest: fix running of integration test
+
+  [ Felipe Sateler ]
+  * Take over the package from the DPMT. Thanks for all the work!
+    - Update Vcs urls
+  * Switch to git-buildpackage for vcs
+  * python2: add ssl_match_hostname and ipaddress dependencies
+  * Restrict python3 package to python 3.5
+
+ -- Felipe Sateler <fsateler@debian.org>  Fri, 14 Oct 2016 21:15:59 -0300
+
+python-docker (1.7.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release (Closes: #816622).
+  * Standards-Version is 3.9.7 now (no change).
+  * Changed Vcs-Git URL to https.
+  * Added myself to d/copyright.
+  * Lower Docker API version to 1.20 for Docker 1.8.3 compatibility
+
+ -- Ondřej Nový <novy@ondrej.org>  Wed, 23 Mar 2016 07:26:35 +0100
+
+python-docker (1.5.0-1) unstable; urgency=medium
+
+  * Update to 1.5.0 upstream release.
+
+ -- Tianon Gravi <tianon@debian.org>  Sun, 08 Nov 2015 12:59:38 -0800
+
+python-docker (1.3.1-1) unstable; urgency=medium
+
+  * Update to 1.3.1 upstream release.
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Tue, 28 Jul 2015 13:25:20 -0700
+
+python-docker (1.3.0-2) unstable; urgency=medium
+
+  * Update 01_requirements.patch to reflect that the requirements are actually
+    stored in no less than three separate files (Closes: #793024).
+  * Add a DEP8 test that runs upstream's integration tests to verify
+    basic functionality.
+  * Patch the default API version down one notch to match src:docker.io (to be
+    removed when Docker 1.7+ gets into the archive).
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Mon, 20 Jul 2015 18:03:45 +0000
+
+python-docker (1.3.0-1) unstable; urgency=medium
+
+  * Update to 1.3.0 upstream release.
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Thu, 16 Jul 2015 18:00:39 +0000
+
+python-docker (1.2.3-1) unstable; urgency=medium
+
+  * Update to 1.2.3 upstream release (Closes: #790817).
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Thu, 02 Jul 2015 02:25:42 +0000
+
+python-docker (1.2.2-2) unstable; urgency=medium
+
+  * Relax requests dependency slightly to account for the accidental misupload
+    to unstable.
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Sun, 29 Mar 2015 19:58:18 -0600
+
+python-docker (1.2.2-1) unstable; urgency=medium
+
+  * Update to 1.2.2 upstream release (Closes: #781355)
+  * Update debian/watch to use the pypi.debian.net redirector
+  * Update Build-Depends, 01_requirements.patch, and comment in debian/rules
+    regarding tests
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Sun, 29 Mar 2015 19:58:18 -0600
+
+python-docker (0.5.3-2) unstable; urgency=medium
+
+  * Remove 02_use-system-urllib3.patch thanks to the fix in requests
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Thu, 13 Nov 2014 06:29:26 +0000
+
+python-docker (0.5.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Added debian/patches/02_use-system-urllib3.patch (Closes: #767445).
+  * Renamed debian/patches/requirements.patch to
+    debian/patches/01_requirements.patch following convention from other
+    Python packages.
+
+ -- Jakub Warmuz <jakub@warmuz.org>  Sat, 01 Nov 2014 18:19:57 +0100
+
+python-docker (0.5.3-1) unstable; urgency=medium
+
+  * Update to 0.5.3 upstream release
+    - 0.5.3: Fixed attaching when connecting to the daemon over a UNIX socket.
+    - 0.5.2: Fixed a bug where sockets were closed immediately when attaching
+             over TLS.
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Fri, 17 Oct 2014 06:12:19 +0000
+
+python-docker (0.5.1-1) unstable; urgency=medium
+
+  * Update to 0.5.1 upstream release
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Thu, 16 Oct 2014 07:05:26 +0000
+
+python-docker (0.5.0-1) unstable; urgency=medium
+
+  * Update to 0.5.0 upstream release
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Sun, 14 Sep 2014 00:56:13 +0000
+
+python-docker (0.4.0-1) unstable; urgency=medium
+
+  * Update to 0.4.0 upstream release
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Mon, 28 Jul 2014 10:43:40 -0600
+
+python-docker (0.3.2-1) unstable; urgency=medium
+
+  * Update to 0.3.2 upstream release
+  * Bump Standards-Version to 3.9.5
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Thu, 17 Jul 2014 21:51:51 -0400
+
+python-docker (0.2.3-1) unstable; urgency=low
+
+  * Initial release (Closes: #734679)
+
+ -- Paul Tagliamonte <paultag@debian.org>  Mon, 10 Feb 2014 22:13:24 -0500
diff --git a/compat b/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/compat
@@ -0,0 +1 @@
+10
diff --git a/control b/control
new file mode 100644
index 0000000..df817fc
--- /dev/null
+++ b/control
@@ -0,0 +1,58 @@
+Source: python-docker
+Section: python
+Priority: optional
+Maintainer: Felipe Sateler <fsateler@debian.org>
+Uploaders: Jason Pleau <jason@jpleau.ca>
+Build-Depends: debhelper (>= 10),
+ dh-python,
+ python-all (>= 2.7),
+ python3-all,
+ python-setuptools,
+ python3-setuptools,
+# setup.py
+ python-requests (>= 2.11.1~),
+ python-six (>= 1.4.0~),
+ python-websocket (>= 0.32.0~),
+ python-dockerpycreds (>= 0.2.1),
+ python-backports.ssl-match-hostname (>= 3.5),
+ python-ipaddress (>=1.0.16),
+# setup.py - python3
+ python3-requests (>= 2.11.1~),
+ python3-six (>= 1.4.0~),
+ python3-websocket (>= 0.32.0~),
+ python3-dockerpycreds (>= 0.2.1),
+# test-requirements.txt
+# python-mock (>= 1.0.1~),
+# python-coverage (>= 3.7.1~),
+# docker.io,
+Standards-Version: 4.1.1
+Homepage: https://github.com/docker/docker-py
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/python-docker.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/python-docker.git
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.5
+
+Package: python-docker
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends},
+ python-backports.ssl-match-hostname (>= 3.5),
+ python-ipaddress (>=1.0.16)
+Breaks: python-magnum (<< 5.0.0),
+ python-senlin (<< 2.0.0),
+ docker-compose (<< 1.10)
+Description: Python wrapper to access docker.io's control socket
+ This package contains oodles of routines that aid in controlling
+ docker.io over it's socket control, the same way the docker.io
+ client controls the daemon.
+ .
+ This package provides Python 2 module bindings only.
+
+Package: python3-docker
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Python 3 wrapper to access docker.io's control socket
+ This package contains oodles of routines that aid in controlling
+ docker.io over it's socket control, the same way the docker.io
+ client controls the daemon.
+ .
+ This package provides Python 3 module bindings only.
diff --git a/copyright b/copyright
new file mode 100644
index 0000000..75d9002
--- /dev/null
+++ b/copyright
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: docker
+Upstream-Contact: Docker, Inc.
+Source: https://github.com/docker/docker-py
+
+Files: *
+Copyright: 2014 Docker, Inc.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2014 Paul R. Tagliamonte <paultag@debian.org>
+           2014 Tianon Gravi <tianon@debian.org>
+           2016 Ondřej Nový <novy@ondrej.org>
+           2017 Jason Pleau <jason@jpleau.ca>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/gbp.conf b/gbp.conf
new file mode 100644
index 0000000..6dc3643
--- /dev/null
+++ b/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+pristine-tar = True
+patch-numbers = False
+debian-branch = master
+
+[dch]
+full = True
+multimaint-merge = True
diff --git a/patches/Do-not-require-pip-for-building.patch b/patches/Do-not-require-pip-for-building.patch
new file mode 100644
index 0000000..30bc1e5
--- /dev/null
+++ b/patches/Do-not-require-pip-for-building.patch
@@ -0,0 +1,32 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Sun, 16 Jul 2017 11:34:24 -0400
+Subject: Do not require pip for building
+
+It is only used to check for docker-py existece,
+but that doesn't matter in the context of a debian build
+---
+ setup.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4a33c8d..e8f13ee 100644
+--- a/setup.py
++++ b/setup.py
+@@ -5,17 +5,8 @@ import codecs
+ import os
+ import sys
+ 
+-import pip
+-
+ from setuptools import setup, find_packages
+ 
+-if 'docker-py' in [x.project_name for x in pip.get_installed_distributions()]:
+-    print(
+-        'ERROR: "docker-py" needs to be uninstalled before installing this'
+-        ' package:\npip uninstall docker-py', file=sys.stderr
+-    )
+-    sys.exit(1)
+-
+ ROOT_DIR = os.path.dirname(__file__)
+ SOURCE_DIR = os.path.join(ROOT_DIR)
+ 
diff --git a/patches/requirements.patch b/patches/requirements.patch
new file mode 100644
index 0000000..75180e3
--- /dev/null
+++ b/patches/requirements.patch
@@ -0,0 +1,64 @@
+From: Tianon Gravi <tianon@debian.org>
+Date: Sun, 8 Nov 2015 10:36:49 -0800
+Subject: Unpin dependencies so newer versions satisfy them appropriately
+
+Forwarded: https://github.com/dotcloud/docker-py/issues/101 (upstream has no interest)
+
+Patch-Name: requirements.patch
+---
+ requirements.txt      | 32 ++++++++++++++++----------------
+ test-requirements.txt | 10 +++++-----
+ 2 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index f3c61e7..0e013c8 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,16 +1,16 @@
+-appdirs==1.4.3
+-asn1crypto==0.22.0
+-backports.ssl-match-hostname==3.5.0.1
+-cffi==1.10.0
+-cryptography==1.9
+-docker-pycreds==0.2.1
+-enum34==1.1.6
+-idna==2.5
+-ipaddress==1.0.18
+-packaging==16.8
+-pycparser==2.17
+-pyOpenSSL==17.0.0
+-pyparsing==2.2.0
+-requests==2.14.2
+-six==1.10.0
+-websocket-client==0.40.0
++appdirs>=1.4.3
++asn1crypto>=0.22.0
++backports.ssl-match-hostname>=3.5.0.1
++cffi>=1.10.0
++cryptography>=1.9
++docker-pycreds>=0.2.1
++enum34>=1.1.6
++idna>=2.5
++ipaddress>=1.0.18
++packaging>=16.8
++pycparser>=2.17
++pyOpenSSL>=17.0.0
++pyparsing>=2.2.0
++requests>=2.14.2
++six>=1.10.0
++websocket-client>=0.40.0
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 460db10..9f9eb50 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,5 +1,5 @@
+-mock==1.0.1
+-pytest==2.9.1
+-coverage==3.7.1
+-pytest-cov==2.1.0
+-flake8==2.4.1
++mock>=1.0.1
++pytest>=2.9.1
++coverage>=3.7.1
++pytest-cov>=2.1.0
++flake8>=2.4.1
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..0d3bb78
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,2 @@
+requirements.patch
+Do-not-require-pip-for-building.patch
diff --git a/pydist-overrides b/pydist-overrides
new file mode 100644
index 0000000..e5dee6e
--- /dev/null
+++ b/pydist-overrides
@@ -0,0 +1 @@
+websocket-client python-websocket
diff --git a/rules b/rules
new file mode 100755
index 0000000..91e153c
--- /dev/null
+++ b/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=docker
+
+# The pypi bundle includes the tests (https://github.com/docker/docker-py/issues/308), but they're really invasive and fail for reasons I haven't yet diagnosed.
+export PYBUILD_DISABLE=test
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f docker_py.egg-info/SOURCES.txt
+
+%:
+	dh $@ --with python2,python3 --buildsystem pybuild
diff --git a/source/format b/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/tests/control b/tests/control
new file mode 100644
index 0000000..3b02db1
--- /dev/null
+++ b/tests/control
@@ -0,0 +1,3 @@
+Tests: integration
+Depends: docker.io, python-mock, python-pytest, python3-mock, python3-pytest, python-backports.ssl-match-hostname, @
+Restrictions: isolation-machine needs-root
diff --git a/tests/integration b/tests/integration
new file mode 100755
index 0000000..156b4e7
--- /dev/null
+++ b/tests/integration
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+py.test-3 tests/integration/
+py.test tests/integration/
diff --git a/watch b/watch
new file mode 100644
index 0000000..99f8c16
--- /dev/null
+++ b/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/-?(rc|a|b|c)/~$1/ \
+https://pypi.debian.net/docker/docker-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))