diff options
| -rw-r--r-- | pbr/tests/util.py | 4 | ||||
| -rw-r--r-- | pbr/util.py | 4 | ||||
| -rw-r--r-- | tools/integration.sh | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/pbr/tests/util.py b/pbr/tests/util.py index e657508..de5a740 100644 --- a/pbr/tests/util.py +++ b/pbr/tests/util.py @@ -44,9 +44,9 @@ import shutil import stat try: - import configparser -except ImportError: import ConfigParser as configparser +except ImportError: + import configparser @contextlib.contextmanager diff --git a/pbr/util.py b/pbr/util.py index 3faa58e..6339116 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -73,9 +73,9 @@ from setuptools.dist import Distribution from setuptools.extension import Extension try: - import configparser -except ImportError: import ConfigParser as configparser +except ImportError: + import configparser import pbr.hooks diff --git a/tools/integration.sh b/tools/integration.sh index 1e42aff..3b5e2a2 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -48,8 +48,11 @@ cat <<EOF > ~/.pip/pip.conf log = $HOME/pip.log EOF -mkvenv $jeepybvenv 'setuptools>=0.7' pip -$jeepybvenv/bin/pip install -U git+https://review.openstack.org/p/openstack-infra/jeepyb.git +jeepybsourcedir=$tmpdir/jeepybsourcedir +git clone $REPODIR/jeepyb $jeepybsourcedir + +mkvenv $jeepybvenv setuptools pip +$jeepybvenv/bin/pip install -e $jeepybsourcedir cat <<EOF > $tmpdir/mirror.yaml cache-root: $tmpdownload @@ -57,7 +60,7 @@ cache-root: $tmpdownload mirrors: - name: openstack projects: - - https://github.com/openstack/requirements + - file://$REPODIR/requirements output: $pypidir EOF @@ -68,7 +71,6 @@ cd $pbrsdistdir $jeepybvenv/bin/run-mirror -b remotes/origin/master --verbose -c $tmpdir/mirror.yaml --no-process $jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack 'pip==1.0' 'setuptools>=0.7' -$jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack 'setuptools<0.7' $jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack -r requirements.txt $jeepybvenv/bin/python setup.py sdist -d $tmpdownload/pip/openstack @@ -164,7 +166,7 @@ for PROJECT in $PROJECTS ; do # Test that the tarball installs cd $tmpdir tarballvenv=$tmpdir/tarball - mkvenv $tarballvenv 'setuptools>=0.7' 'pip>=1.3,<1.4' + mkvenv $tarballvenv setuptools pip $tarballvenv/bin/pip install $shortprojectdir/dist/*tar.gz # Test pip installing |