[ARVADOS] created: 1.1.3-129-g8e2a634

Git user git at public.curoverse.com
Mon Mar 5 15:23:02 EST 2018


        at  8e2a634e2b0ef180f30db5322233244b142f93f6 (commit)


commit 8e2a634e2b0ef180f30db5322233244b142f93f6
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Mar 5 17:20:01 2018 -0300

    12268: Update nodemanager dependency on libcloud 2.3.0
    
    As we're now using the official release, this update run-test.sh will
    try to install from PyPI.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/build/libcloud-pin.sh b/build/libcloud-pin.sh
index c795bb8..63f65ad 100644
--- a/build/libcloud-pin.sh
+++ b/build/libcloud-pin.sh
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-LIBCLOUD_PIN=2.2.2.dev4
+LIBCLOUD_PIN=2.3.0
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 48b3eab..d18250a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -533,6 +533,7 @@ pip freeze 2>/dev/null | egrep ^PyYAML= \
 # won't pick it up by default.
 pip freeze 2>/dev/null | egrep ^apache-libcloud==$LIBCLOUD_PIN \
     || pip install --pre --ignore-installed https://github.com/curoverse/libcloud/archive/apache-libcloud-$LIBCLOUD_PIN.zip >/dev/null \
+    || pip install apache-libcloud>=$LIBCLOUD_PIN >/dev/null \
     || fatal "pip install apache-libcloud failed"
 
 # We need an unreleased (as of 2017-08-17) llfuse bugfix, otherwise our fuse test suite deadlocks.
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 7b02357..454c24e 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -36,22 +36,19 @@ setup(name='arvados-node-manager',
           ('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst']),
       ],
       install_requires=[
-          'apache-libcloud>=2.2',
+          'apache-libcloud>=2.3',
           'arvados-python-client>=0.1.20170731145219',
           'future',
           'pykka',
           'python-daemon',
           'setuptools'
       ],
-      dependency_links=[
-          "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.2.2.dev4.zip"
-      ],
       test_suite='tests',
       tests_require=[
           'requests',
           'pbr<1.7.0',
           'mock>=1.0',
-          'apache-libcloud==2.2.2.dev4',
+          'apache-libcloud>=2.3',
       ],
       zip_safe=False,
       cmdclass={'egg_info': tagger},

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list