diff -Nru python-oslo.middleware-3.33.0/ChangeLog python-oslo.middleware-3.34.0/ChangeLog --- python-oslo.middleware-3.33.0/ChangeLog 2017-12-04 10:35:25.000000000 +0000 +++ python-oslo.middleware-3.34.0/ChangeLog 2018-01-15 20:28:51.000000000 +0000 @@ -1,6 +1,13 @@ CHANGES ======= +3.34.0 +------ + +* Avoid tox\_install.sh for constraints support +* Updated from global requirements +* add bandit to pep8 job + 3.33.0 ------ diff -Nru python-oslo.middleware-3.33.0/debian/changelog python-oslo.middleware-3.34.0/debian/changelog --- python-oslo.middleware-3.33.0/debian/changelog 2017-12-08 11:22:53.000000000 +0000 +++ python-oslo.middleware-3.34.0/debian/changelog 2018-01-26 10:48:01.000000000 +0000 @@ -1,3 +1,10 @@ +python-oslo.middleware (3.34.0-0ubuntu1) bionic; urgency=medium + + * New upstream release for OpenStack Queens. + * d/control: Align (Build-)Depends with upstream. + + -- James Page Fri, 26 Jan 2018 10:48:01 +0000 + python-oslo.middleware (3.33.0-0ubuntu1) bionic; urgency=medium * New upstream release for OpenStack Queens. diff -Nru python-oslo.middleware-3.33.0/debian/control python-oslo.middleware-3.34.0/debian/control --- python-oslo.middleware-3.33.0/debian/control 2017-12-08 11:22:53.000000000 +0000 +++ python-oslo.middleware-3.34.0/debian/control 2018-01-26 10:48:01.000000000 +0000 @@ -29,7 +29,7 @@ python-oslo.context (>= 2.19.2), python-oslo.i18n (>= 3.15.3), python-oslo.serialization (>= 2.18.0), - python-oslo.utils (>= 3.31.0), + python-oslo.utils (>= 3.33.0), python-oslotest (>= 1.10.0), python-six (>= 1.10.0), python-sphinx (>= 1.5.1), @@ -47,7 +47,7 @@ python3-oslo.context (>= 2.19.2), python3-oslo.i18n (>= 3.15.3), python3-oslo.serialization (>= 2.18.0), - python3-oslo.utils (>= 3.31.0), + python3-oslo.utils (>= 3.33.0), python3-oslotest (>= 1.10.0), python3-six (>= 1.10.0), python3-sphinx (>= 1.5.1), @@ -71,7 +71,7 @@ python-oslo.config (>= 1:5.1.0), python-oslo.context (>= 2.19.2), python-oslo.i18n (>= 3.15.3), - python-oslo.utils (>= 3.31.0), + python-oslo.utils (>= 3.33.0), python-pbr (>= 2.0.0), python-six (>= 1.10.0), python-statsd (>= 3.2.1), @@ -107,7 +107,7 @@ python3-oslo.config (>= 1:5.1.0), python3-oslo.context (>= 2.19.2), python3-oslo.i18n (>= 3.15.3), - python3-oslo.utils (>= 3.31.0), + python3-oslo.utils (>= 3.33.0), python3-pbr (>= 2.0.0), python3-six (>= 1.10.0), python3-statsd (>= 3.2.1), diff -Nru python-oslo.middleware-3.33.0/oslo.middleware.egg-info/pbr.json python-oslo.middleware-3.34.0/oslo.middleware.egg-info/pbr.json --- python-oslo.middleware-3.33.0/oslo.middleware.egg-info/pbr.json 2017-12-04 10:35:25.000000000 +0000 +++ python-oslo.middleware-3.34.0/oslo.middleware.egg-info/pbr.json 2018-01-15 20:28:51.000000000 +0000 @@ -1 +1 @@ -{"git_version": "9d75e6c", "is_release": true} \ No newline at end of file +{"git_version": "abfd726", "is_release": true} \ No newline at end of file diff -Nru python-oslo.middleware-3.33.0/oslo.middleware.egg-info/PKG-INFO python-oslo.middleware-3.34.0/oslo.middleware.egg-info/PKG-INFO --- python-oslo.middleware-3.33.0/oslo.middleware.egg-info/PKG-INFO 2017-12-04 10:35:25.000000000 +0000 +++ python-oslo.middleware-3.34.0/oslo.middleware.egg-info/PKG-INFO 2018-01-15 20:28:51.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.middleware -Version: 3.33.0 +Version: 3.34.0 Summary: Oslo Middleware library Home-page: https://docs.openstack.org/oslo.middleware/latest/ Author: OpenStack diff -Nru python-oslo.middleware-3.33.0/oslo.middleware.egg-info/requires.txt python-oslo.middleware-3.34.0/oslo.middleware.egg-info/requires.txt --- python-oslo.middleware-3.33.0/oslo.middleware.egg-info/requires.txt 2017-12-04 10:35:25.000000000 +0000 +++ python-oslo.middleware-3.34.0/oslo.middleware.egg-info/requires.txt 2018-01-15 20:28:51.000000000 +0000 @@ -3,7 +3,7 @@ oslo.config>=5.1.0 oslo.context>=2.19.2 oslo.i18n>=3.15.3 -oslo.utils>=3.31.0 +oslo.utils>=3.33.0 six>=1.10.0 stevedore>=1.20.0 WebOb>=1.7.1 diff -Nru python-oslo.middleware-3.33.0/oslo.middleware.egg-info/SOURCES.txt python-oslo.middleware-3.34.0/oslo.middleware.egg-info/SOURCES.txt --- python-oslo.middleware-3.33.0/oslo.middleware.egg-info/SOURCES.txt 2017-12-04 10:35:25.000000000 +0000 +++ python-oslo.middleware-3.34.0/oslo.middleware.egg-info/SOURCES.txt 2018-01-15 20:28:52.000000000 +0000 @@ -82,5 +82,4 @@ releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po -releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po -tools/tox_install.sh \ No newline at end of file +releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po \ No newline at end of file diff -Nru python-oslo.middleware-3.33.0/PKG-INFO python-oslo.middleware-3.34.0/PKG-INFO --- python-oslo.middleware-3.33.0/PKG-INFO 2017-12-04 10:35:25.000000000 +0000 +++ python-oslo.middleware-3.34.0/PKG-INFO 2018-01-15 20:28:52.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.middleware -Version: 3.33.0 +Version: 3.34.0 Summary: Oslo Middleware library Home-page: https://docs.openstack.org/oslo.middleware/latest/ Author: OpenStack diff -Nru python-oslo.middleware-3.33.0/requirements.txt python-oslo.middleware-3.34.0/requirements.txt --- python-oslo.middleware-3.33.0/requirements.txt 2017-12-04 10:32:38.000000000 +0000 +++ python-oslo.middleware-3.34.0/requirements.txt 2018-01-15 20:25:55.000000000 +0000 @@ -7,7 +7,7 @@ oslo.config>=5.1.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 -oslo.utils>=3.31.0 # Apache-2.0 +oslo.utils>=3.33.0 # Apache-2.0 six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 WebOb>=1.7.1 # MIT diff -Nru python-oslo.middleware-3.33.0/test-requirements.txt python-oslo.middleware-3.34.0/test-requirements.txt --- python-oslo.middleware-3.33.0/test-requirements.txt 2017-12-04 10:32:16.000000000 +0000 +++ python-oslo.middleware-3.34.0/test-requirements.txt 2018-01-15 20:25:55.000000000 +0000 @@ -12,3 +12,5 @@ coverage!=4.4,>=4.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 +# Bandit security code scanner +bandit>=1.1.0 # Apache-2.0 diff -Nru python-oslo.middleware-3.33.0/tools/tox_install.sh python-oslo.middleware-3.34.0/tools/tox_install.sh --- python-oslo.middleware-3.33.0/tools/tox_install.sh 2017-12-04 10:32:16.000000000 +0000 +++ python-oslo.middleware-3.34.0/tools/tox_install.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Client constraint file contains this client version pin that is in conflict -# with installing the client from source. We should remove the version pin in -# the constraints file before applying it for from-source installation. - -CONSTRAINTS_FILE="$1" -shift 1 - -set -e - -# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get -# published to logs.openstack.org for easy debugging. -localfile="$VIRTUAL_ENV/log/upper-constraints.txt" - -if [[ "$CONSTRAINTS_FILE" != http* ]]; then - CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE" -fi -# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep -curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile" - -pip install -c"$localfile" openstack-requirements - -# This is the main purpose of the script: Allow local installation of -# the current repo. It is listed in constraints file and thus any -# install will be constrained and we need to unconstrain it. -edit-constraints "$localfile" -- "$CLIENT_NAME" - -pip install -c"$localfile" -U "$@" -exit $? diff -Nru python-oslo.middleware-3.33.0/tox.ini python-oslo.middleware-3.34.0/tox.ini --- python-oslo.middleware-3.33.0/tox.ini 2017-12-04 10:32:16.000000000 +0000 +++ python-oslo.middleware-3.34.0/tox.ini 2018-01-15 20:25:55.000000000 +0000 @@ -5,14 +5,17 @@ [testenv] setenv = VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=oslo.middleware -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} -deps = -r{toxinidir}/test-requirements.txt +install_command = pip install {opts} {packages} +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] -commands = flake8 +commands = + flake8 + # Run security linter + bandit -r oslo_middleware -x tests -n5 [testenv:venv] commands = {posargs}