From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 15 Jan 2019 15:25:58 +0000 (-0500)
Subject: [RM-37848] add remoto as a requirement in setup.py
X-Git-Tag: v2.1.0~26^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e74809f42e47ba86d2b2c42273fd1285d551992b;p=ceph-deploy.git

[RM-37848] add remoto as a requirement in setup.py

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/setup.py b/setup.py
index c4fd46f..1a465b9 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,6 @@ from setuptools import setup, find_packages
 import os
 import sys
 import ceph_deploy
-from vendor import vendorize, clean_vendor
 
 
 def read(fname):
@@ -10,23 +9,12 @@ def read(fname):
     f = open(path)
     return f.read()
 
-install_requires = []
+
+install_requires = ['remoto']
 pyversion = sys.version_info[:2]
 if pyversion < (2, 7) or (3, 0) <= pyversion <= (3, 1):
     install_requires.append('argparse')
 
-#
-# Add libraries that are not part of install_requires but only if we really
-# want to, specified by the environment flag
-#
-
-if os.environ.get('CEPH_DEPLOY_NO_VENDOR'):
-    clean_vendor('remoto')
-else:
-    vendorize([
-        ('remoto', '0.0.33', ['python', 'vendor.py']),
-    ])
-
 
 setup(
     name='ceph-deploy',