diff --git a/.gitignore b/.gitignore index 7acc2eb..7e715b7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ run_tests.log .quantum-venv/ .venv/ quantum/vcsversion.py +requirements.txt +ChangeLog .tox/ diff --git a/openstack-common.conf b/openstack-common.conf new file mode 100644 index 0000000..bd800f2 --- /dev/null +++ b/openstack-common.conf @@ -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 diff --git a/setup.py b/setup.py index f294a3e..d44e791 100644 --- a/setup.py +++ b/setup.py @@ -1,39 +1,37 @@ -try: - from setuptools import setup, find_packages -except ImportError: - from ez_setup import use_setuptools - use_setuptools() - from setuptools import setup, find_packages +# Copyright 2011 OpenStack, LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# 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 os import subprocess + +requires = parse_requirements() +depend_links = parse_dependency_links() +write_requirements() +write_git_changelog() +write_vcsversion('quantum/vcsversion.py') + 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' Url = "https://launchpad.net/quantum" Version = version.canonical_version_string() @@ -45,19 +43,6 @@ Summary = 'Quantum (virtual network service)' ShortDescription = Summary Description = Summary -requires = [ - 'Paste', - 'PasteDeploy', - 'Routes>=1.12.3', - 'eventlet>=0.9.12', - 'lxml', - 'python-gflags', - 'simplejson', - 'sqlalchemy', - 'webob', - 'webtest' -] - EagerResources = [ 'quantum', ] @@ -104,6 +89,7 @@ setup( license=License, scripts=ProjectScripts, install_requires=requires, + dependency_links=depend_links, include_package_data=False, packages=find_packages('.'), data_files=DataFiles, diff --git a/tools/install_venv.py b/tools/install_venv.py index 75a066c..09b321b 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -31,6 +31,7 @@ import sys ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) VENV = os.path.join(ROOT, '.venv') 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]) 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)...' run_command(['tools/with_venv.sh', 'pip', 'install', '-r', 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" pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages", diff --git a/tox.ini b/tox.ini index 20f344d..818bd99 100644 --- a/tox.ini +++ b/tox.ini @@ -2,17 +2,20 @@ envlist = py26,py27,pep8 [testenv] +setenv = VIRTUAL_ENV={envdir} 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] -commands = pep8 --repeat --show-source bin/* quantum setup.py +deps = pep8 +commands = pep8 --repeat --show-source quantum setup.py -[testenv:pylint] -commands = pylint --rcfile=.pylintrc --output-format=parseable quantum +[testenv:venv] +commands = {posargs} [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] downloadcache = ~/cache/pip @@ -27,12 +30,12 @@ deps = file://{toxinidir}/.cache.bundle [testenv:jenkinspep8] deps = file://{toxinidir}/.cache.bundle -commands = pep8 --repeat --show-source bin/* quantum setup.py - -[testenv:jenkinspylint] -deps = file://{toxinidir}/.cache.bundle -commands = pylint -E --rcfile=.pylintrc --output-format=parseable quantum +commands = pep8 --repeat --show-source quantum setup.py [testenv:jenkinscover] 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}