Blame 0001-Remove-runtime-dependency-on-python-pbr.patch
|
Jakub Ruzicka |
fd9e4b8 |
From a45ab368b57891aaa6d6152ec296021dc8aa3e52 Mon Sep 17 00:00:00 2001
|
|
Jakub Ruzicka |
6cace95 |
From: Jakub Ruzicka <jruzicka@redhat.com>
|
|
Jakub Ruzicka |
6cace95 |
Date: Tue, 8 Apr 2014 15:50:33 +0200
|
|
Jakub Ruzicka |
6cace95 |
Subject: [PATCH] Remove runtime dependency on python-pbr
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
Also remove pbr/pkg_resources requirements handling.
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
ERROR: openstackclient.shell Exception raised: \
|
|
Jakub Ruzicka |
6cace95 |
(pycrypto 2.0.1 (/usr/lib64/python2.6/site-packages), Requirement.parse('pycrypto>=2.6'))
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
DO NOT WANT
|
|
Jakub Ruzicka |
6cace95 |
---
|
|
Jakub Ruzicka |
6cace95 |
openstackclient/__init__.py | 8 +-------
|
|
Jakub Ruzicka |
6cace95 |
setup.py | 1 -
|
|
Jakub Ruzicka |
6cace95 |
2 files changed, 1 insertion(+), 8 deletions(-)
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
diff --git a/openstackclient/__init__.py b/openstackclient/__init__.py
|
|
Jakub Ruzicka |
6cace95 |
index 89deee3..b55482b 100644
|
|
Jakub Ruzicka |
6cace95 |
--- a/openstackclient/__init__.py
|
|
Jakub Ruzicka |
6cace95 |
+++ b/openstackclient/__init__.py
|
|
Jakub Ruzicka |
6cace95 |
@@ -13,10 +13,4 @@
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
__all__ = ['__version__']
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
-import pbr.version
|
|
Jakub Ruzicka |
6cace95 |
-
|
|
Jakub Ruzicka |
6cace95 |
-version_info = pbr.version.VersionInfo('python-openstackclient')
|
|
Jakub Ruzicka |
6cace95 |
-try:
|
|
Jakub Ruzicka |
6cace95 |
- __version__ = version_info.version_string()
|
|
Jakub Ruzicka |
6cace95 |
-except AttributeError:
|
|
Jakub Ruzicka |
6cace95 |
- __version__ = None
|
|
Jakub Ruzicka |
6cace95 |
+__version__ = 'REDHATOPENSTACKCLIENTVERSION'
|
|
Jakub Ruzicka |
6cace95 |
diff --git a/setup.py b/setup.py
|
|
Jakub Ruzicka |
d4e655a |
index 7363757..09230a0 100644
|
|
Jakub Ruzicka |
6cace95 |
--- a/setup.py
|
|
Jakub Ruzicka |
6cace95 |
+++ b/setup.py
|
|
Jakub Ruzicka |
d4e655a |
@@ -26,5 +26,4 @@ except ImportError:
|
|
Jakub Ruzicka |
d4e655a |
pass
|
|
Jakub Ruzicka |
6cace95 |
|
|
Jakub Ruzicka |
6cace95 |
setuptools.setup(
|
|
Jakub Ruzicka |
6cace95 |
- setup_requires=['pbr'],
|
|
Jakub Ruzicka |
6cace95 |
pbr=True)
|