Merge pull request #688 from docker/1.3.1-release1.3.1

1.3.1 release

5 files changed, 41 insertions, 4 deletions

diff --git a/Dockerfile b/Dockerfile
index 733f96c..20152f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:2.7
-MAINTAINER Joffrey F <joffrey@dotcloud.com>
+MAINTAINER Joffrey F <joffrey@docker.com>
 ADD . /home/docker-py
 WORKDIR /home/docker-py
 RUN pip install -r test-requirements.txt
diff --git a/Dockerfile-py3 b/Dockerfile-py3
new file mode 100644
index 0000000..31b979b
--- /dev/null
+++ b/Dockerfile-py3
@@ -0,0 +1,6 @@
+FROM python:3.4
+MAINTAINER Joffrey F <joffrey@docker.com>
+ADD . /home/docker-py
+WORKDIR /home/docker-py
+RUN pip install -r test-requirements.txt
+RUN pip install .
diff --git a/Makefile b/Makefile
index cf291ea..ce74974 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all build test integration-test unit-test
+.PHONY: all build test integration-test unit-test build-py3 unit-test-py3 integration-test-py3
 
 HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
 
@@ -7,10 +7,19 @@ all: test
 build:
 	docker build -t docker-py .
 
-test: unit-test integration-test
+build-py3:
+	docker build -t docker-py3 -f Dockerfile-py3 .
+
+test: unit-test integration-test unit-test-py3 integration-test-py3
 
 unit-test: build
 	docker run docker-py python tests/test.py
 
+unit-test-py3: build-py3
+	docker run docker-py3 python tests/test.py
+
 integration-test: build
 	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
+
+integration-test-py3: build-py3
+	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 python tests/integration_test.py
diff --git a/docker/version.py b/docker/version.py
index d0aad76..bc778b9 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.4.0-dev"
+version = "1.3.1"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/docs/change_log.md b/docs/change_log.md
index 305721c..538cca4 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -1,6 +1,28 @@
 Change Log
 ==========
 
+1.3.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.3.1+is%3Aclosed)
+
+### Bugfixes
+
+* Fixed a bug where empty chunks in streams was misinterpreted as EOF.
+* `datetime` arguments passed to `Client.events` parameters `since` and
+  `until` are now always considered to be UTC.
+* Fixed a bug with Docker 1.7.x where the wrong auth headers were being passed
+  in `Client.build`, failing builds that depended on private images.
+* `Client.exec_create` can now retrieve the `Id` key from a dictionary for its
+  container param.
+
+### Miscellaneous
+
+* 404 API status now raises `docker.errors.NotFound`. This exception inherits
+  `APIError` which was used previously.
+* Docs fixes
+* Test ixes
+
 1.3.0
 -----