summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2015-12-07 10:35:02 -0800
committerTim Burke <tim.burke@gmail.com>2016-03-07 11:21:33 -0800
commit52eab61e7e2c6e30f7b5dc19399d35baee0f1b81 (patch)
tree53851d4560f7bb519f0fe98a9fa9fc45b4c8ecde
parentb65d994937682143f0999d7d2ea223d601827252 (diff)
downloadpython-swiftclient-52eab61e7e2c6e30f7b5dc19399d35baee0f1b81.tar.gz
Move python-keystoneclient to "extras"
This should make it more clear to users that they may want to install it. Change-Id: I8bb4f3eba1fc6d2b7b23c3bd51663678e755a69e
-rw-r--r--setup.cfg4
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini1
3 files changed, 5 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index 4c48a65..036ef43 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,10 @@ scripts =
data_files =
share/man/man1 = doc/manpages/swift.1
+[extras]
+keystone =
+ python-keystoneclient>=0.7.0
+
[entry_points]
console_scripts =
swift = swiftclient.shell:main
diff --git a/test-requirements.txt b/test-requirements.txt
index 044f7c3..0a81398 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,5 @@ hacking>=0.10.0,<0.11
coverage>=3.6
mock>=1.2
oslosphinx
-python-keystoneclient>=0.7.0
sphinx>=1.1.2,<1.2
testrepository>=0.0.18
diff --git a/tox.ini b/tox.ini
index 717128b..26cfb11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ setenv =
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
+ .[keystone]
commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
\( -type d -name "__pycache__" -or -type f -name "*.py[co]" \) \
-print0; find . -name "*.dbm*" -print0) | xargs -0 rm -rf'