Skip to content

Commit 07ca4f5

Browse files
committed
Merge pull request #671 from docker/1.3.0-release
1.3.0 release
2 parents 69ef9e5 + b60d57b commit 07ca4f5

File tree

4 files changed

+51
-17
lines changed

4 files changed

+51
-17
lines changed

docker/client.py

-13
Original file line numberDiff line numberDiff line change
@@ -271,19 +271,6 @@ def events(self, since=None, until=None, filters=None, decode=None):
271271
params=params, stream=True),
272272
decode=decode)
273273

274-
@check_resource
275-
def execute(self, container, cmd, detach=False, stdout=True, stderr=True,
276-
stream=False, tty=False):
277-
warnings.warn(
278-
'Client.execute is being deprecated. Please use exec_create & '
279-
'exec_start instead', DeprecationWarning
280-
)
281-
create_res = self.exec_create(
282-
container, cmd, stdout, stderr, tty
283-
)
284-
285-
return self.exec_start(create_res, detach, tty, stream)
286-
287274
def exec_create(self, container, cmd, stdout=True, stderr=True, tty=False,
288275
privileged=False):
289276
if utils.compare_version('1.15', self._version) < 0:

docker/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = "1.3.0-dev"
1+
version = "1.3.0"
22
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])

docs/change_log.md

+49
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,55 @@
11
Change Log
22
==========
33

4+
1.3.0
5+
-----
6+
7+
[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.3.0+is%3Aclosed)
8+
9+
### Deprecation warning
10+
11+
* As announced in the 1.2.0 release, `Client.execute` has been removed in favor of
12+
`Client.exec_create` and `Client.exec_start`.
13+
14+
### Features
15+
16+
* `extra_hosts` parameter in host config can now also be provided as a list.
17+
* Added support for `memory_limit` and `memswap_limit` in host config to
18+
comply with recent deprecations.
19+
* Added support for `volume_driver` in `Client.create_container`
20+
* Added support for advanced modes in volume binds (using the `mode` key)
21+
* Added support for `decode` in `Client.build` (decodes JSON stream on the fly)
22+
* docker-py will now look for login configuration under the new config path,
23+
and fall back to the old `~/.dockercfg` path if not present.
24+
25+
### Bugfixes
26+
27+
* Configuration file lookup now also work on platforms that don't define a
28+
`$HOME` environment variable.
29+
* Fixed an issue where pinging a v2 private registry wasn't working properly,
30+
preventing users from pushing and pulling.
31+
* `pull` parameter in `Client.build` now defaults to `False`. Fixes a bug where
32+
the default options would try to force a pull of non-remote images.
33+
* Fixed a bug where getting logs from tty-enabled containers wasn't working
34+
properly with more recent versions of Docker
35+
* `Client.push` and `Client.pull` will now raise exceptions if the HTTP
36+
status indicates an error.
37+
* Fixed a bug with adapter lookup when using the Unix socket adapter
38+
(this affected some weird edge cases, see issue #647 for details)
39+
* Fixed a bug where providing `timeout=None` to `Client.stop` would result
40+
in an exception despite the usecase being valid.
41+
* Added `git@` to the list of valid prefixes for remote build paths.
42+
43+
### Dependencies
44+
45+
* The websocket-client dependency has been updated to a more recent version.
46+
This new version also supports Python 3.x, making `attach_socket` available
47+
on those versions as well.
48+
49+
### Documentation
50+
51+
* Various fixes
52+
453
1.2.3
554
-----
655

setup.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
requirements = [
1010
'requests >= 2.5.2',
1111
'six >= 1.3.0',
12+
'websocket-client >= 0.32.0',
1213
]
1314

14-
if sys.version_info[0] < 3:
15-
requirements.append('websocket-client >= 0.32.0')
16-
1715
exec(open('docker/version.py').read())
1816

1917
with open('./test-requirements.txt') as test_reqs_txt:

0 commit comments

Comments
 (0)