Split out pip requires and aligned tox file.
Align tox.ini file with standards. Align setup.py with openstack-common standards. Change-Id: I333bbd66648c865a5c97ec2661359ab849274446
This commit is contained in:
parent
28a77c944c
commit
23625ca58d
|
@ -8,4 +8,6 @@ run_tests.log
|
||||||
.quantum-venv/
|
.quantum-venv/
|
||||||
.venv/
|
.venv/
|
||||||
quantum/vcsversion.py
|
quantum/vcsversion.py
|
||||||
|
requirements.txt
|
||||||
|
ChangeLog
|
||||||
.tox/
|
.tox/
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
[DEFAULT]
|
||||||
|
|
||||||
|
# The list of modules to copy from openstack-common
|
||||||
|
modules=setup
|
||||||
|
|
||||||
|
# The base module to hold the copy of openstack.common
|
||||||
|
base=quantum
|
72
setup.py
72
setup.py
|
@ -1,39 +1,37 @@
|
||||||
try:
|
# Copyright 2011 OpenStack, LLC
|
||||||
from setuptools import setup, find_packages
|
#
|
||||||
except ImportError:
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
from ez_setup import use_setuptools
|
# you may not use this file except in compliance with the License.
|
||||||
use_setuptools()
|
# You may obtain a copy of the License at
|
||||||
from setuptools import setup, find_packages
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
|
from quantum.openstack.common.setup import parse_requirements
|
||||||
|
from quantum.openstack.common.setup import parse_dependency_links
|
||||||
|
from quantum.openstack.common.setup import write_requirements
|
||||||
|
from quantum.openstack.common.setup import write_git_changelog
|
||||||
|
from quantum.openstack.common.setup import write_vcsversion
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
requires = parse_requirements()
|
||||||
|
depend_links = parse_dependency_links()
|
||||||
|
write_requirements()
|
||||||
|
write_git_changelog()
|
||||||
|
write_vcsversion('quantum/vcsversion.py')
|
||||||
|
|
||||||
from quantum import version
|
from quantum import version
|
||||||
|
|
||||||
|
|
||||||
def run_git_command(cmd):
|
|
||||||
output = subprocess.Popen(["/bin/sh", "-c", cmd],
|
|
||||||
stdout=subprocess.PIPE)
|
|
||||||
return output.communicate()[0].strip()
|
|
||||||
|
|
||||||
|
|
||||||
if os.path.isdir('.git'):
|
|
||||||
branch_nick_cmd = 'git branch | grep -Ei "\* (.*)" | cut -f2 -d" "'
|
|
||||||
branch_nick = run_git_command(branch_nick_cmd)
|
|
||||||
revid_cmd = "git --no-pager log --max-count=1 | cut -f2 -d' ' | head -1"
|
|
||||||
revid = run_git_command(revid_cmd)
|
|
||||||
revno_cmd = "git --no-pager log --oneline | wc -l"
|
|
||||||
revno = run_git_command(revno_cmd)
|
|
||||||
with open("quantum/vcsversion.py", 'w') as version_file:
|
|
||||||
version_file.write("""
|
|
||||||
# This file is automatically generated by setup.py, So don't edit it. :)
|
|
||||||
version_info = {
|
|
||||||
'branch_nick': '%s',
|
|
||||||
'revision_id': '%s',
|
|
||||||
'revno': %s
|
|
||||||
}
|
|
||||||
""" % (branch_nick, revid, revno))
|
|
||||||
|
|
||||||
Name = 'quantum'
|
Name = 'quantum'
|
||||||
Url = "https://launchpad.net/quantum"
|
Url = "https://launchpad.net/quantum"
|
||||||
Version = version.canonical_version_string()
|
Version = version.canonical_version_string()
|
||||||
|
@ -45,19 +43,6 @@ Summary = 'Quantum (virtual network service)'
|
||||||
ShortDescription = Summary
|
ShortDescription = Summary
|
||||||
Description = Summary
|
Description = Summary
|
||||||
|
|
||||||
requires = [
|
|
||||||
'Paste',
|
|
||||||
'PasteDeploy',
|
|
||||||
'Routes>=1.12.3',
|
|
||||||
'eventlet>=0.9.12',
|
|
||||||
'lxml',
|
|
||||||
'python-gflags',
|
|
||||||
'simplejson',
|
|
||||||
'sqlalchemy',
|
|
||||||
'webob',
|
|
||||||
'webtest'
|
|
||||||
]
|
|
||||||
|
|
||||||
EagerResources = [
|
EagerResources = [
|
||||||
'quantum',
|
'quantum',
|
||||||
]
|
]
|
||||||
|
@ -104,6 +89,7 @@ setup(
|
||||||
license=License,
|
license=License,
|
||||||
scripts=ProjectScripts,
|
scripts=ProjectScripts,
|
||||||
install_requires=requires,
|
install_requires=requires,
|
||||||
|
dependency_links=depend_links,
|
||||||
include_package_data=False,
|
include_package_data=False,
|
||||||
packages=find_packages('.'),
|
packages=find_packages('.'),
|
||||||
data_files=DataFiles,
|
data_files=DataFiles,
|
||||||
|
|
|
@ -31,6 +31,7 @@ import sys
|
||||||
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, 'tools', 'pip-requires')
|
||||||
|
TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires')
|
||||||
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])
|
||||||
|
|
||||||
VENV_EXISTS = bool(os.path.exists(VENV))
|
VENV_EXISTS = bool(os.path.exists(VENV))
|
||||||
|
@ -93,6 +94,8 @@ def install_dependencies(venv=VENV):
|
||||||
print 'Installing dependencies with pip (this can take a while)...'
|
print 'Installing dependencies with pip (this can take a while)...'
|
||||||
run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
|
run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
|
||||||
PIP_REQUIRES], redirect_output=False)
|
PIP_REQUIRES], redirect_output=False)
|
||||||
|
run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
|
||||||
|
TEST_REQUIRES], redirect_output=False)
|
||||||
|
|
||||||
# Tell the virtual env how to "import quantum"
|
# Tell the virtual env how to "import quantum"
|
||||||
pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages",
|
pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages",
|
||||||
|
|
|
@ -8,15 +8,5 @@ python-gflags==1.3
|
||||||
simplejson
|
simplejson
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
webob==1.0.8
|
webob==1.0.8
|
||||||
webtest
|
|
||||||
|
|
||||||
distribute>=0.6.24
|
|
||||||
|
|
||||||
coverage
|
|
||||||
mock>=0.7.1
|
|
||||||
nose
|
|
||||||
nosexcover
|
|
||||||
pep8==0.6.1
|
|
||||||
|
|
||||||
-e git+https://review.openstack.org/p/openstack/python-quantumclient#egg=python-quantumclient-dev
|
-e git+https://review.openstack.org/p/openstack/python-quantumclient#egg=python-quantumclient-dev
|
||||||
-e git+https://review.openstack.org/p/openstack-dev/openstack-nose.git#egg=openstack.nose_plugin
|
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
distribute>=0.6.24
|
||||||
|
|
||||||
|
coverage
|
||||||
|
mock>=0.7.1
|
||||||
|
nose
|
||||||
|
nosexcover
|
||||||
|
openstack.nose_plugin
|
||||||
|
pep8==0.6.1
|
||||||
|
webtest
|
25
tox.ini
25
tox.ini
|
@ -2,17 +2,20 @@
|
||||||
envlist = py26,py27,pep8
|
envlist = py26,py27,pep8
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/tools/pip-requires
|
deps = -r{toxinidir}/tools/pip-requires
|
||||||
commands = nosetests --where=quantum/tests/unit
|
-r{toxinidir}/tools/test-requires
|
||||||
|
commands = nosetests --where=quantum/tests/unit {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands = pep8 --repeat --show-source bin/* quantum setup.py
|
deps = pep8
|
||||||
|
commands = pep8 --repeat --show-source quantum setup.py
|
||||||
|
|
||||||
[testenv:pylint]
|
[testenv:venv]
|
||||||
commands = pylint --rcfile=.pylintrc --output-format=parseable quantum
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
commands = nosetests --with-coverage --cover-html --cover-erase --cover-package=quantum
|
commands = nosetests --with-coverage --cover-html --cover-erase --cover-package=quantum {posargs}
|
||||||
|
|
||||||
[testenv:hudson]
|
[testenv:hudson]
|
||||||
downloadcache = ~/cache/pip
|
downloadcache = ~/cache/pip
|
||||||
|
@ -27,12 +30,12 @@ deps = file://{toxinidir}/.cache.bundle
|
||||||
|
|
||||||
[testenv:jenkinspep8]
|
[testenv:jenkinspep8]
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
deps = file://{toxinidir}/.cache.bundle
|
||||||
commands = pep8 --repeat --show-source bin/* quantum setup.py
|
commands = pep8 --repeat --show-source quantum setup.py
|
||||||
|
|
||||||
[testenv:jenkinspylint]
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
commands = pylint -E --rcfile=.pylintrc --output-format=parseable quantum
|
|
||||||
|
|
||||||
[testenv:jenkinscover]
|
[testenv:jenkinscover]
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
deps = file://{toxinidir}/.cache.bundle
|
||||||
commands = nosetests --where=quantum/tests/unit --cover-erase --cover-package=quantum --with-xcoverage
|
commands = nosetests --where=quantum/tests/unit --cover-erase --cover-package=quantum --with-xcoverage {posargs}
|
||||||
|
|
||||||
|
[testenv:jenkinsvenv]
|
||||||
|
deps = file://{toxinidir}/.cache.bundle
|
||||||
|
commands = {posargs}
|
||||||
|
|
Loading…
Reference in New Issue