diff options
| -rw-r--r-- | pbr/core.py | 2 | ||||
| -rw-r--r-- | pbr/packaging.py | 4 | ||||
| -rw-r--r-- | test-requirements-py3.txt | 10 | ||||
| -rw-r--r-- | tools/integration.sh | 6 | ||||
| -rw-r--r-- | tox.ini | 6 |
5 files changed, 7 insertions, 21 deletions
diff --git a/pbr/core.py b/pbr/core.py index 3e398c3..f622ad0 100644 --- a/pbr/core.py +++ b/pbr/core.py @@ -52,7 +52,7 @@ from pbr import util core.Distribution = dist._get_unpatched(core.Distribution) if sys.version_info[0] == 3: string_type = str - integer_types = int + integer_types = (int,) else: string_type = basestring integer_types = (int, long) diff --git a/pbr/packaging.py b/pbr/packaging.py index 04e3290..c33f401 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -275,14 +275,14 @@ def generate_authors(git_dir=None, dest_dir='.', option_dict=dict()): and not os.access(new_authors, os.W_OK)): return log.info('[pbr] Generating AUTHORS') - jenkins_email = 'jenkins@review' + ignore_emails = '(jenkins@review|infra@lists)' if git_dir is None: git_dir = _get_git_directory() if git_dir: # don't include jenkins email address in AUTHORS file git_log_cmd = ("git --git-dir=" + git_dir + " log --format='%aN <%aE>' | sort -u | " - "egrep -v '" + jenkins_email + "'") + "egrep -v '" + ignore_emails + "'") changelog = _run_shell_command(git_log_cmd) signed_cmd = ("git log --git-dir=" + git_dir + " | grep -i Co-authored-by: | sort -u") diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt deleted file mode 100644 index eba16b8..0000000 --- a/test-requirements-py3.txt +++ /dev/null @@ -1,10 +0,0 @@ -coverage>=3.6 -discover -fixtures>=0.3.12 -flake8 -python-subunit -sphinx>=1.1.2 --e bzr+lp:testrepository#egg=testrepository -testresources -testscenarios -testtools>=0.9.27 diff --git a/tools/integration.sh b/tools/integration.sh index ef0b2f3..1e42aff 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -27,7 +27,7 @@ BASE=${BASE:-/opt/stack} REPODIR=${REPODIR:-$BASE/new} # TODO: Figure out how to get this on to the box properly -sudo apt-get install -y --force-yes libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev +sudo apt-get install -y --force-yes libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev libffi-dev tmpdir=`mktemp -d` @@ -45,7 +45,7 @@ mkdir -p ~/.pip cat <<EOF > ~/.pip/pip.conf [global] -log = /home/jenkins/pip.log +log = $HOME/pip.log EOF mkvenv $jeepybvenv 'setuptools>=0.7' pip @@ -87,7 +87,7 @@ cat <<EOF > ~/.pip/pip.conf [global] index-url = $pypiurl extra-index-url = http://pypi.openstack.org/openstack -log = /home/jenkins/pip.log +log = $HOME/pip.log EOF eptest=$tmpdir/eptest @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,pep8 +envlist = py26,py27,py33,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -11,10 +11,6 @@ deps = -r{toxinidir}/requirements.txt commands = python setup.py testr --testr-args='{posargs}' -[testenv:py33] -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements-py3.txt - [tox:jenkins] sitepackages = True downloadcache = ~/cache/pip |