From 72ed58d02ede0057a3c037656ed117f24352ebfb Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Tue, 22 Jan 2019 10:03:47 +0100 Subject: [PATCH] Fix stable/rocky gate issues When setting this to the 13.0.0b2 beta version the logic that pulls in the correct versions for stable branches breaks. This changes to use the first stable release as the minimal requirement which unblocks the CI. This change also addresses an issue where toxenv fails on deleting a non-empty __pycache__ directory. This fixes the find command syntax to be more tolerant of this scenario. Change-Id: Ifbad29674a3d47aa0185e27f51e8d83a45ec6d56 --- requirements.txt | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1ef7c173..58a7a55a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,4 +17,4 @@ oslo.messaging>=5.29.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 -neutron>=13.0.0.0b2 # Apache-2.0 +neutron>=13.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 02275baa..071b78a6 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ whitelist_externals = sh commands = find . -type f -name "*.py[c|o]" -delete - find . -type d -name "__pycache__" -delete + find . -depth -path "*/__pycache__*" -delete stestr run {posargs} # there is also secret magic in stestr which lets you run in a fail only # mode. To do this define the TRACE_FAILONLY environmental variable.