Rename requires files to standard names.
Rename tools/pip-requires to requirements.txt and tools/test-requires
to test-requirements.txt. These are standard files, and tools in the
general world are growing intelligence about them.
Fixes: bug #1179008
Change-Id: I1a19f0c73ab48987e2ff0dade1a57a68b65f0a22
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -18,7 +18,6 @@ doc/build
|
|||||||
doc/source/modules.rst
|
doc/source/modules.rst
|
||||||
doc/source/keystone.*
|
doc/source/keystone.*
|
||||||
ChangeLog
|
ChangeLog
|
||||||
requirements.txt
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
build/
|
build/
|
||||||
dist/
|
dist/
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ Clone the keystone repository::
|
|||||||
|
|
||||||
Install the dependencies to run keystone::
|
Install the dependencies to run keystone::
|
||||||
|
|
||||||
sudo pip install -r tools/pip-requires
|
sudo pip install -r requirements.txt
|
||||||
|
|
||||||
And at this point, you should have all the pieces you need to run keystone
|
And at this point, you should have all the pieces you need to run keystone
|
||||||
installed on your system. The following commands should be available on the
|
installed on your system. The following commands should be available on the
|
||||||
|
|||||||
@@ -66,8 +66,8 @@ Installing dependencies
|
|||||||
|
|
||||||
Keystone maintains two lists of dependencies::
|
Keystone maintains two lists of dependencies::
|
||||||
|
|
||||||
tools/pip-requires
|
requirements.txt
|
||||||
tools/test-requires
|
test-requirements.txt
|
||||||
|
|
||||||
The first is the list of dependencies needed for running keystone, the second list includes dependencies used for active development and testing of keystone itself.
|
The first is the list of dependencies needed for running keystone, the second list includes dependencies used for active development and testing of keystone itself.
|
||||||
|
|
||||||
@@ -124,10 +124,10 @@ If you want to run keystone outside of a virtualenv, you can install the
|
|||||||
dependencies directly into your system from the requires files::
|
dependencies directly into your system from the requires files::
|
||||||
|
|
||||||
# Install the dependencies for running keystone
|
# Install the dependencies for running keystone
|
||||||
$ pip install -r tools/pip-requires
|
$ pip install -r requirements.txt
|
||||||
|
|
||||||
# Install the dependencies for developing, testing, and running keystone
|
# Install the dependencies for developing, testing, and running keystone
|
||||||
$ pip install -r tools/test-requires
|
$ pip install -r test-requirements.txt
|
||||||
|
|
||||||
# Use python setup.py to link Keystone into python's site-packages
|
# Use python setup.py to link Keystone into python's site-packages
|
||||||
$ python setup.py develop
|
$ python setup.py develop
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ function run_pep8 {
|
|||||||
echo "Running pep8 ..."
|
echo "Running pep8 ..."
|
||||||
# Opt-out files from pep8
|
# Opt-out files from pep8
|
||||||
ignore_scripts="*.pyc,*.pyo,*.sh,*.swp,*.rst"
|
ignore_scripts="*.pyc,*.pyo,*.sh,*.swp,*.rst"
|
||||||
ignore_files="*pip-requires"
|
ignore_files="*.txt"
|
||||||
ignore_dirs=".venv,.tox,dist,doc,openstack,vendor,*egg"
|
ignore_dirs=".venv,.tox,dist,doc,openstack,vendor,*egg"
|
||||||
ignore="$ignore_scripts,$ignore_files,$ignore_dirs"
|
ignore="$ignore_scripts,$ignore_files,$ignore_dirs"
|
||||||
srcfiles="."
|
srcfiles="."
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ def print_help():
|
|||||||
def main(argv):
|
def main(argv):
|
||||||
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
venv = os.path.join(root, '.venv')
|
venv = os.path.join(root, '.venv')
|
||||||
pip_requires = os.path.join(root, 'tools', 'pip-requires')
|
pip_requires = os.path.join(root, 'requirements.txt')
|
||||||
test_requires = os.path.join(root, 'tools', 'test-requires')
|
test_requires = os.path.join(root, 'test-requirements.txt')
|
||||||
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
||||||
project = 'Keystone'
|
project = 'Keystone'
|
||||||
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
||||||
|
|||||||
4
tox.ini
4
tox.ini
@@ -10,8 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
NOSE_OPENSTACK_YELLOW=0.025
|
NOSE_OPENSTACK_YELLOW=0.025
|
||||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||||
NOSE_OPENSTACK_STDOUT=1
|
NOSE_OPENSTACK_STDOUT=1
|
||||||
deps = -r{toxinidir}/tools/pip-requires
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/tools/test-requires
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = nosetests {posargs}
|
commands = nosetests {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
|||||||
Reference in New Issue
Block a user