diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-04-25 12:59:53 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-04-29 18:49:36 +1200 |
| commit | 0971d6f63adf19eea45791d34619d27a0ba73553 (patch) | |
| tree | 1161d5fad502d2889bd3cb06cdb1b3e2e1a6ecb3 | |
| parent | 4008b5ef0cbde7f15435a16cd8800bed7a21adf4 (diff) | |
| download | pbr-0971d6f63adf19eea45791d34619d27a0ba73553.tar.gz | |
Stop testing setup.py easy_install behaviour
Instead test pip install more thoroughly.
Also document that we don't support setup.py install's easy-install
behaviour.
Change-Id: I87872a69425f9d4f17047e584c12516508d57b16
| -rw-r--r-- | doc/source/index.rst | 5 | ||||
| -rw-r--r-- | tools/integration.sh | 18 |
2 files changed, 9 insertions, 14 deletions
diff --git a/doc/source/index.rst b/doc/source/index.rst index 918be40..bc5441d 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -10,6 +10,11 @@ the results in as the arguments to a call to `setup.py` - so the heavy lifting of handling python packaging needs is still being done by `setuptools`. +Note that we don't support the `easy_install` aspects of setuptools: while +we depend on setup_requires, for any install_requires we recommend that they +be installed prior to running `setup.py install` - either by hand, or by using +an install tool such as `pip`. + What It Does ============ diff --git a/tools/integration.sh b/tools/integration.sh index 5d04df2..0847481 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -202,23 +202,13 @@ for PROJECT in $PROJECTS ; do pipvenv=$tmpdir/pip mkvenv $pipvenv $pipvenv/bin/pip $PIPFLAGS install -f $WHEELHOUSE git+file://$shortprojectdir + # Ensure the install_package_data is doing the thing it should do + if [ $SHORT_PROJECT = 'nova' ]; then + find $pipvenv | grep migrate.cfg + fi # Test pip install -e pipvenv=$tmpdir/pip mkvenv $pipvenv $pipvenv/bin/pip $PIPFLAGS install -f $WHEELHOUSE -e $shortprojectdir - - # Test python setup.py install - installvenv=$tmpdir/install - mkvenv $installvenv - - installprojectdir=$projectdir/install$SHORT_PROJECT - git clone $shortprojectdir $installprojectdir - cd $installprojectdir - $installvenv/bin/python setup.py install - - # Ensure the install_package_data is doing the thing it should do - if [ $SHORT_PROJECT = 'nova' ]; then - find $installvenv | grep migrate.cfg - fi done |