[ARVADOS] created: 2f48564bde85698768e12a4bae3cf0b9df761c64

[Git user]

        at  2f48564bde85698768e12a4bae3cf0b9df761c64 (commit)


commit 2f48564bde85698768e12a4bae3cf0b9df761c64
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Apr 8 16:16:09 2016 -0400

    8904: Pin docker-py to 1.7.1 on wheezy.
    
    1.8 requires Python 3.3+.

diff --git a/services/dockercleaner/fpm-info.sh b/services/dockercleaner/fpm-info.sh
new file mode 100644
index 0000000..7387899
--- /dev/null
+++ b/services/dockercleaner/fpm-info.sh
@@ -0,0 +1,5 @@
+case "$TARGET" in
+    debian7)
+        fpm_args+=(-v 1.7.1)
+        ;;
+esac
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 1a9d0fd..16c2bd5 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -12,6 +12,11 @@ try:
 except ImportError:
     tagger = egg_info_cmd.egg_info
 
+if sys.version_info < (3, 3):
+    docker_py_req = 'docker-py==1.7.1'
+else:
+    docker_py_req = 'docker-py'
+
 setup(name="arvados-docker-cleaner",
       version="0.1",
       description="Arvados Docker cleaner",
@@ -25,7 +30,7 @@ setup(name="arvados-docker-cleaner",
           ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt']),
       ],
       install_requires=[
-        'docker-py',
+          docker_py_req,
         ],
       tests_require=[
         'pbr<1.7.0',

-----------------------------------------------------------------------


hooks/post-receive
--