Merge "Update UPPER_CONSTRAINTS_FILE for stable/rocky" into stable/rocky

Merge "Update .gitreview for stable/rocky" into stable/rocky
Update UPPER_CONSTRAINTS_FILE for stable/rocky
2018-08-27 22:11:21 +00:00 · 2018-08-23 23:28:33 +00:00 · 2018-08-23 13:11:30 +00:00 · 2018-08-20 04:53:33 +00:00 · 2018-08-20 02:32:54 +00:00
5 changed files with 5 additions and 4 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/python-neutronclient.git
+defaultbranch=stable/rocky
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -63,7 +63,7 @@ oslo.serialization==2.18.0
 oslo.service==1.24.0
 oslo.utils==3.33.0
 oslotest==3.2.0
-osprofiler==1.4.0
+osprofiler==2.3.0
 paramiko==2.0.0
 Paste==2.0.2
 PasteDeploy==1.5.0
--- a/neutronclient/tests/unit/test_http.py
+++ b/neutronclient/tests/unit/test_http.py
@@ -77,7 +77,7 @@ class TestHTTPClientMixin(object):

    def test_osprofiler_headers_are_injected(self):
        osprofiler.profiler.init('SWORDFISH')
-        self.addCleanup(osprofiler.profiler._clean)
+        self.addCleanup(osprofiler.profiler.clean)

        headers = {'Accept': 'application/json'}
        headers.update(osprofiler.web.get_trace_id_headers())
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
-osprofiler>=1.4.0 # Apache-2.0
+osprofiler>=2.3.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
         PYTHONWARNINGS=default::DeprecationWarning
 usedevelop = True
 install_command = pip install {opts} {packages}
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
       -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 # Delete bytecodes from normal directories before running tests.
Author	SHA1	Message	Date
Zuul	7eba94ee32	Merge "Update UPPER_CONSTRAINTS_FILE for stable/rocky" into stable/rocky	2018-08-27 22:11:21 +00:00
Zuul	aa5ed26b96	Merge "Update .gitreview for stable/rocky" into stable/rocky	2018-08-23 23:28:33 +00:00
OpenStack Release Bot	96f2131883	Update UPPER_CONSTRAINTS_FILE for stable/rocky The new stable upper-constraints file is only available after the openstack/requirements repository is branched. This will happen around the RC1 timeframe. Recheck and merge this change once the requirements repository has been branched. The CI system will work with this patch before the requirements repository is branched because zuul configues the job to run with a local copy of the file and defaults to the master branch. However, accepting the patch will break the test configuration on developers' local systems, so please wait until after the requirements repository is branched to merge the patch. Depends-On: https://review.openstack.org/#/c/592627/ Change-Id: Idddb419fbcaa2f4f95c607cbd5b257b6fbe76a96	2018-08-23 13:11:30 +00:00
OpenStack Release Bot	d17e520130	Update .gitreview for stable/rocky Depends-On: https://review.openstack.org/#/c/592627/ Change-Id: I6aa69e3ff384223f67c4f9fbc7b69c49a3eaa271	2018-08-20 04:53:33 +00:00
Yushiro FURUKAWA	272f097db0	Fix broken unittests _clean() method is renamed to clean() in osprofiler 2.3.0. It was suggested in a past neutronclient review. Closes-Bug: #1783789 Co-Authored-By: Akihiro Motoki <amotoki@gmail.com> Depends-On: https://review.openstack.org/#/c/592018/ Change-Id: Ic8e03db85dc08cfdcac5507e99ecdf7eac8eb972 (cherry picked from commit `bca82e2fba`)	2018-08-20 02:32:54 +00:00