openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Use constraints for all the things"

Browse Source
This commit is contained in:
Jenkins
2016-05-25 02:17:48 +00:00
committed by Gerrit Code Review
parent 015fad6054 4e35b0ee64
commit ced9a754dd
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -39,6 +39,7 @@ RUN apt-mark manual python-minimal
# Install requirements separately, because pip understands a git+https url # Install requirements separately, because pip understands a git+https url
# while setuptools doesn't # while setuptools doesn't
RUN proxy.sh pip install --upgrade pip RUN proxy.sh pip install --upgrade pip
# TODO(jroll) use upper-constraints here
RUN proxy.sh pip install --no-cache-dir -r /tmp/ironic-python-agent/requirements.txt RUN proxy.sh pip install --no-cache-dir -r /tmp/ironic-python-agent/requirements.txt
# This will succeed because all the dependencies were installed previously # This will succeed because all the dependencies were installed previously

20
tox.ini
View File

@@ -5,7 +5,7 @@ envlist = py34,py27,func,pep8
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = pip install --allow-external -U {opts} {packages} install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./ironic_python_agent/tests/unit OS_TEST_PATH=./ironic_python_agent/tests/unit
@@ -29,11 +29,23 @@ commands =
doc8 doc/source README.rst doc8 doc/source README.rst
[testenv:cover] [testenv:cover]
# NOTE(amrith) The setting of the install_command in this location
# is only required because currently infra does not actually
# support constraints files for the cover job, and while
# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
# no file there. It can be removed when infra changes this.
install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
commands = commands =
python setup.py test --coverage --coverage-package-name ironic_python_agent {posargs} python setup.py test --coverage --coverage-package-name ironic_python_agent {posargs}
[testenv:venv] [testenv:venv]
# NOTE(amrith) The setting of the install_command in this location
# is only required because currently infra does not actually
# support constraints files for the docs job, and while
# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
# no file there. It can be removed when infra changes this.
install_command = pip install -U {opts} {packages}
setenv = PYTHONHASHSEED=0 setenv = PYTHONHASHSEED=0
commands = {posargs:} commands = {posargs:}
@@ -49,6 +61,12 @@ commands =
python setup.py build_sphinx python setup.py build_sphinx
[testenv:releasenotes] [testenv:releasenotes]
# NOTE(amrith) The setting of the install_command in this location
# is only required because currently infra does not actually
# support constraints files for the releasenotes job, and while
# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
# no file there. It can be removed when infra changes this.
install_command = pip install -U {opts} {packages}
envdir = {toxworkdir}/venv envdir = {toxworkdir}/venv
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html