diff options
| -rw-r--r-- | pbr/packaging.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tools/integration.sh | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index c39f5f7..4d1332e 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -87,9 +87,11 @@ def _pip_install(links, requires, root=None, option_dict=dict()): for link in links: cmd.append("-f") cmd.append(link) + + # NOTE(ociuhandu): popen on Windows does not accept unicode strings _run_shell_command( cmd + requires, - throw_on_error=True, buffer=False, env=dict(PIP_USE_WHEEL="true")) + throw_on_error=True, buffer=False, env=dict(PIP_USE_WHEEL=b"true")) def _any_existing(file_list): @@ -280,7 +282,7 @@ def write_git_changelog(git_dir=None, dest_dir=os.path.curdir, underline = len(tag) * '-' if not first_line: - changelog_file.write(u'\n') + changelog_file.write('\n') changelog_file.write( ("%(tag)s\n%(underline)s\n\n" % dict(tag=tag, diff --git a/requirements.txt b/requirements.txt index 9dd4ec3..a1b589e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pip>=1.4 +pip diff --git a/tools/integration.sh b/tools/integration.sh index 8053406..b6021f3 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -106,6 +106,8 @@ sudo chown root:root /etc/apache2/sites-available/pypi sudo a2ensite pypi sudo service apache2 reload +#BRANCH +BRANCH=${OVERRIDE_ZUUL_BRANCH=:-master} # PROJECTS is a list of projects that we're testing PROJECTS=$* @@ -117,7 +119,7 @@ cd $pbrsdistdir # --no-update is passed as well. The one thing the -b # does give us is it makes run-mirror install dependencies # once instead of over and over for all branches it can find. -$pypimirrorvenv/bin/run-mirror -b remotes/origin/master --no-update --verbose -c $tmpdir/mirror.yaml --no-process --export=$HOME/mirror_package_list.txt +$pypimirrorvenv/bin/run-mirror -b remotes/origin/$BRANCH --no-update --verbose -c $tmpdir/mirror.yaml --no-process --export=$HOME/mirror_package_list.txt # Compare packages in the mirror with the list of requirements gen_bare_package_list "$REPODIR/requirements/global-requirements.txt $REPODIR/requirements/dev-requirements.txt" > bare_all_requirements.txt gen_bare_package_list $HOME/mirror_package_list.txt > bare_mirror_package_list.txt @@ -130,7 +132,7 @@ $pypimirrorvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload $pypimirrorvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack -r requirements.txt $pypimirrorvenv/bin/python setup.py sdist -d $tmpdownload/pip/openstack -$pypimirrorvenv/bin/run-mirror -b remotes/origin/master --no-update --verbose -c $tmpdir/mirror.yaml --no-download +$pypimirrorvenv/bin/run-mirror -b remotes/origin/$BRANCH --no-update --verbose -c $tmpdir/mirror.yaml --no-download find $pypidir -type f -name '*.html' -delete find $pypidir |