58 Commits

Author SHA1 Message Date
liu-sheng
74f953a1d7 Remove vi modelines
We don't need to have the vi modelines in each source file,
it can be set in a user's vimrc if required.

Also a check is added to hacking to detect if they are re-added.

Change-Id: I347307a5145b2760c69085b6ca850d6a9137ffc6
Closes-Bug: #1229324
2014-02-03 14:19:44 +00:00
Jenkins
767bf3b536 Merge "Use print function rather than print statement" 2013-10-15 01:49:50 +00:00
Mark McLoughlin
fd3328511d Remove obsolete redhat-eventlet.patch
See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gorey details on
why this exists.

As of this fix:

https://github.com/eventlet/eventlet/pull/34

which was released in eventlet 0.13, we no longer need the patch.

This has now been removed from oslo-incubator, so this is really just
syncing that removal.

Change-Id: I84267f3c6726cb2e750f615e107c48b12c6ed353
2013-10-09 21:34:58 +01:00
David Ripton
a52db496a5 Use print function rather than print statement
This is for Python 3 compatibility, since Python 3 does not support
the print statement, only the print function.  (Python 2.6 and 2.7
support both, depending on whether a __future__ import is used.)

Paths containing "xen" were left alone, because of comments in a
couple of the files indicating that the XenServer code needed to be
compatible with Python 2.4.

Fixes bug 1226943

Change-Id: I23b804a4d99500b4acf81dd19645ab06dfcc9f1c
2013-10-08 11:13:45 -04:00
Ruby Loo
5740920bb3 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.

Change-Id: I68ece8406fb1d4e082a42db8e76e17b1aaa7e775
Fixes: bug #1179008
2013-05-22 20:12:08 +00:00
Kurt Taylor
d17f9ab13d Update OpenStack LLC to Foundation
Update all references of "LLC" to "Foundation".

Change-Id: I009e86784ef4dcf38882d64b0eff484576e04efe
2013-02-26 19:15:29 -05:00
Jenkins
20424b9879 Merge "support reloctable venv roots in testing framework" 2013-02-11 18:11:24 +00:00
Chet Burgess
4c891b9243 support reloctable venv roots in testing framework
run_tests.sh, with_venv.sh, and the install_venv.py scripts now
support relocating the venv root to another location.

All 3 scripts now support new envinroment variables to configure
the location of the venv and the tools directory. To maintain
compatability the defaults are set to the current values.

venv_path = Location of the virtualenv directory
	Default: $(pwd)

venv_name = Name of the virtualenv directory
	Default: .venv

tools_path = Location of the tools directory
	Default: $(pwd)

Additionally the run_tests.sh script also takes these value as
arguments and will pass them along accordingly.

--virtual-env-path <path>   Location of the virtualenv directory
                             Default: $(pwd)
--virtual-env-name <name>   Name of the virtualenv directory
                             Default: .venv
--tools-path <dir>          Location of the tools directory
                             Default: $(pwd)

DocImpact

Change-Id: I1be036058227206ecca342f692cd3d6aadb24069
Fixes: bug #1116942
2013-02-07 12:38:45 -08:00
Matthew Treinish
cacc8ff92d Sync latest install_venv_common from oslo.
This commit syncs in the latest version of install_venv_common
from oslo, which fixes the import issue that was previously
addressed by change: I8a3df02a51c2c777d8f47cb8bc72d0644ae47095
which gets reverted by this commit.

Change-Id: I910610da5a4c413711819ca39627cb9ee94814ef
2013-02-06 16:26:08 -05:00
Matthew Treinish
38c7fa2ab9 Fix import for install_venv.py
On systems that don't use devstack the nova directory
doesn't automatically get added to the python path. This
breaks tools/install_venv_common.py which imports from
nova.openstack.common. This fixes the issue by manually
adding the nova root directory to the python path before
tools/install_venv_common.py is imported.

Change-Id: I8a3df02a51c2c777d8f47cb8bc72d0644ae47095
2013-02-04 10:14:32 -05:00
Matthew Treinish
c69ce047ad Use install_venv_common.py from oslo.
This syncs install_venv_common.py from oslo and reworks the
tools/install_venv.py script to use the new library.

Change-Id: I020eae1ec9e3a6aae0ecc7825c0ef723ab247f39
2013-01-28 13:57:59 -05:00
Clark Boylan
4abc8cc64f Use testr to run nova unittests.
Convert nova from using nosetests to testr for its test runner. Some
tests had to be modified to get them to run properly under testr.

run_tests.sh has been updated to run testr instead of nosetests.

Coverage is collected by running subunit.run under coverage.py when the
coverage environment is selected.

Note that you will need to rebuild your virtualenvs as nose is being
removed from the dependency lists and is being replaced by testr. Tests
will run in different processes once this test is merged so you cannot
use test classes to pass information between tests. Each test should be
a proper independent unit. Additionally the -x and -d flags to
run_tests.sh have been removed as there are currently no decent
approximations for those functions.

Change-Id: I019ca098972ca749b195f59968cf21edd5ba9109
2012-12-14 14:22:20 -08:00
Monty Taylor
36a8fe04c4 Change install_venv to use setup.py develop.
With the potential use of entry points, code from the current tree needs to
be installed into a venv created by install_venv.py via setup.py develop.
This will ensure that the appropriate meta-data and paths are set in the
virtualenv.

Change-Id: I1ca15959c98a24629d2f5b2c385296c4e2fe770c
2012-10-17 12:13:20 -07:00
Dan Prince
4fc05bff1f Nail the pip requirement at 1.1.
The most recent version of pip (1.2.1 as of a couple days ago) fails
to install the required Nova .venv packages. Nailing the installed
pip version when using run_tests.sh seems like a reasonable solution
to this issue.

Fixes LP Bug #1047120.

Change-Id: Ic947c04603cf9423c0cf2835351785d4fe795c4b
2012-09-07 12:48:40 -04:00
Zhongyue Luo
61c5597a09 Backslash continuation removal (Nova folsom-2)
Fixes bug #938588

Backslash continuations removal for scripts in bin/, plugin/, and etc.

Change-Id: Idd17048b6e8db6e939946968e011e68da8585b8d
2012-05-31 11:26:37 +08:00
Alex Meade
998e57b296 Updated docstrings in /tools as per HACKING
Change-Id: I06db6653784eb298ef7f78ebe99865b9c635aade
2012-03-28 15:25:45 -04:00
Monty Taylor
51210081a8 Support tox-based unittests.
Change-Id: I6a0a616a979688595762e6b772d77a14f1968070
2012-02-20 11:54:37 -08:00
Brian Waldon
3759bcf3fc Excise M2Crypto!
This required rewriting our Diffie-Hellman-Merkle implementation for
set_admin_password in xen. Fixes bug 917851.

Change-Id: Ic4cdcc06221f003aec2dcd5ba05a1a9ad19d39c9
2012-02-02 10:12:58 -08:00
Daniel P. Berrange
d97b64b6e6 Tell users what is about to be installed via sudo
Rather than just giving users the sudo password prompt immediately,
actually tell them what is about to be installed, so they know
whether it is reasonable to be entering their password.

Change-Id: Ic0c1de812be119384753895531a008075b13494e
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-01-05 16:08:04 +00:00
Monty Taylor
f9ec38578b Install a good version of pip in the venv.
Change-Id: I1059824aae8c5bf1a65de6cfaef96fef0f68d8a3
2012-01-02 13:35:57 -08:00
James E. Blair
5235106e95 Rename .nova-venv to .venv.
This simplifies a number of Jenkins jobs which currently, other
than directory names, could be the same for all OpenStack
projects. By renaming the virtualenv directory, the redundant
Jenkins virtualenv build and copy jobs can be eliminated.

Change-Id: Ieaf1dac3207ecb34b911c7edcd2086809abdf49e
2011-12-08 15:17:51 -08:00
Adrian Smith
dbbd6cf107 Use system M2Crypto package on Oneiric, bug 892271
Ubuntu Oneiric has a problem with the pip installed version of m2crypto.
This fix installs python-m2crypto via apt-get on Oneiric.

Change-Id: I8290a74b614eb0d0b8d620dbad19d2cc6843de8b
2011-12-06 19:45:21 +00:00
Mark McLoughlin
b0ad7284aa install_venv: apply eventlet patch correctly with python 2.7 (#890461)
Looks like the fix for #884915 only works with RHEL6. Make it work
correctly on Fedora 16.

Change-Id: I8c996f20d49db688fd8e692bcd836dee693d362a
2011-11-15 08:43:46 +00:00
Lorin Hochstein
9175822ffe Workaround for eventlet bug with unit tests in RHEL6.1.
This adds a patch to fix the broken eventlet code that's installed in the
virtualenv.

Fixes bug 884915

Change-Id: I6dbf755abbc5a52208de3dd892257ce39686d396
2011-11-09 14:54:16 -05:00
Lorin Hochstein
e42fe8565c Apply M2Crypto fix for all Fedora-based distributions.
Broaden Fedora check to include RHEL and others.

Fixes bug 884885

Change-Id: Ifab330a7f866add91d01c8cf2470e5a12fb4cd4d
2011-11-09 14:54:16 -05:00
Lorin Hochstein
b08bd96ce5 Optional --no-site-packages in venv
Added a flag to run_tests.sh to allow user to optionally install venv with --no-site-packages.

This fixes bug 880905

Change-Id: Ic645e0ec56c90b72fef526ebc9f55975d446e2ae
2011-10-30 11:06:10 -04:00
Mark McLoughlin
c00cfc642a venv: update distribute as well as pip
When you create a virtualenv, pip and setuptools/distribute is
installed.

When we later run install_venv.py to update the venv, we should
be sure to grab the latest versions of pip and distribute otherwise
issues like this one are masked:

  http://code.google.com/p/sqlalchemy-migrate/issues/detail?id=131

Change-Id: Id206be478ea6c5216dcee6f2f58dc91858c843f5
2011-10-25 14:39:12 +01:00
Monty Taylor
3c6ce70a51 Upgrade pip in the venv when we build it.
Change-Id: I924975170c9e3a1ef23b5195cb3a6eed675ec043
2011-10-19 18:03:51 -04:00
Mark McLoughlin
6c97436656 install_venv: pip install M2Crypto doesn't work on Fedora
... so use the system m2crypto library instead.

M2Crypto won't build on Fedora because of some bizarre differences with
Fedora's OpenSSL headers. I can get it to build by doing e.g.

 $> python ./tools/install_venv.py
 $> cd .nova-venv/build/M2Crypto
 $> for i in SWIG/_ec.i SWIG/_evp.i; do sed -i -e "s/opensslconf/opensslconf-x86_64/" $i ; done
 $> cd -
 $> SWIG_FEATURES=-cpperraswarn ./tools/with_venv.sh pip install M2Crypto

but that's clearly no fun. It should be fine to just use the system
version.

Change-Id: I94c7464bf60ae586e16a2f38b7440cea8dc110e5
2011-09-29 16:08:04 +01:00
Mark McLoughlin
9f529afd47 install_venv: add support for distro specific code
... and use it to install virtualenv with yum if it's not available.

Change-Id: Ibfeeb9c23324724bc26895504e6229076d793c6d
2011-09-29 16:08:00 +01:00
Mark McLoughlin
7eeee584ad install_venv: don't use --no-site-packages with virtualenv
libvirt isn't listed in pip-requires because (a) it's not in PyPi and
(b) you always want to use libvirt's python bindings that matches the
version of libvirt installed on the system.

Currently, running nova-compute in virtualenv fails because libvirt
can't be imported. The --no-site-packages flag is what prevents this.
Everything seems to work fine without it. To verify, try deleting the
no-global-site-packages.txt from your .nova-venv.

Change-Id: I1df5e8e3c4426ca333c2d6b5b4fa8ece144dddf3
2011-09-29 16:07:45 +01:00
Mark McLoughlin
f373a0f6f8 install_venv: pass the --upgrade argument to pip install
Subsequent runs of install_venv.sh should upgrade packages to the
latest available.

Change-Id: Ib9c9ee270b778363900d92398f00c1cab3508578
2011-09-29 16:07:39 +01:00
Mark McLoughlin
de5e6ea29e install_venv: refactor out pip_install helper
We don't need to pass the -E argument since we're already running
inside the virtualenv.

Change-Id: Idd77b9bdc067e2288d0fa694a2bb6769675065cf
2011-09-29 16:07:23 +01:00
Brian Waldon
07646e8584 removing compute monitor 2011-08-02 10:09:58 -04:00
William Wolf
8b716bc23a fix pep8 issues 2011-06-01 10:37:54 -04:00
Justin Shepherd
ea3b85bc27 Fixed all pep8 errors in tools/install_venv.py. All tests pass. 2011-05-16 11:16:55 -05:00
William Wolf
1330241020 fixed pep8 spacing issue 2011-05-12 09:19:01 -04:00
William Wolf
f99c5f60d2 got rid of extra whitespace 2011-05-02 16:58:06 -04:00
William Wolf
221a756550 Update tools/pip-requires and tools/install_venv.py for python2.7 support (works in ubuntu 11.04) 2011-05-02 16:55:54 -04:00
John Tran
d137ffdc2f Add a patch for python eventlet, when using install_venv.py (see FAQ # 1485) 2011-04-05 18:35:15 -07:00
Lorin Hochstein
4c66b2bb2a Now tries to install virtualenv via easy_install if not present 2011-01-11 13:11:30 -05:00
Monty Taylor
cda407fa0e A small fix to the install_venv program to allow us to run it on the tarmac box as part of the tarmac build. 2010-09-20 13:40:42 +00:00
Michael Gundlach
90ca9b3739 Fix a pep8 violation. 2010-08-25 17:36:03 +00:00
Monty Taylor
7f666230e3 A few small changes to install_venv to let venv builds work on the tarmac box. 2010-08-25 16:45:59 +00:00
Justin Santa Barbara
7e403e3816 Fix to better reflect (my believed intent) as to the meaning of error_ok (ignore stderr vs accept failure) 2010-08-18 22:19:39 +01:00
Justin Santa Barbara
d8f8d121a0 Merged with trunk 2010-08-18 22:14:24 +01:00
Michael Gundlach
ad3bda4b1a pep8 typo 2010-08-18 11:53:41 -04:00
Michael Gundlach
23e9600fc6 Fix pep8 violation 2010-08-18 10:09:11 -04:00
Michael Gundlach
9878a6b8b4 Simpler installation, and, can run install_venv from anywhere instead of just from checkout root 2010-08-17 11:03:15 -04:00
jaypipes@gmail.com
49e5701d23 Changes the run_tests.sh and /tools/install_venv.py scripts to be
more user-friendly and not depend on PIP while not in the virtual
environment.
2010-08-11 02:02:17 +00:00