From 814c019e9fc8c4d3cdfbcb807358d15310ebbdda Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Thu, 2 Apr 2020 15:19:47 +0200 Subject: [PATCH 1/3] Do a squash-merge merging into master --- .zuul.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.zuul.yaml b/.zuul.yaml index 636de0f2d..64f756567 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,5 @@ - project: + merge-mode: squash-merge check: jobs: - tox-py37 From 3e5ba528061c5e2749ef3fc4f9d07e9a6fc81ae7 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Mon, 6 Apr 2020 10:26:45 +0200 Subject: [PATCH 2/3] undo squash-merge --- .zuul.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 64f756567..636de0f2d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: - merge-mode: squash-merge check: jobs: - tox-py37 From cdd2be1b8c7637dbdd80f6c26b512cceeb7ea5a3 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Mon, 6 Apr 2020 11:30:30 +0200 Subject: [PATCH 3/3] sync test-requirements with latest upstream changes --- test-requirements.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index f159c07e4..5cc4021f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,22 +1,30 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=1.0,<1.2 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 +ddt>=1.0.1 # MIT extras>=1.0.0 # MIT fixtures>=3.0.0 # Apache-2.0/BSD jsonschema>=2.6.0 # MIT -mock>=2.0.0 # BSD +mock>=3.0.0 # BSD +prometheus-client>=0.4.2 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD +oslo.config>=6.1.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -requests-mock>=1.1.0 # Apache-2.0 +requests-mock>=1.2.0 # Apache-2.0 +statsd>=3.3.0 stestr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT -doc8>=0.8.0 # Apache-2.0 -python-openstackclient>=3.12.1 # Apache-2.0 +doc8>=0.8.0 # Apache-2.0 +Pygments>=2.2.0 # BSD license + +# OTCE specifics +# Func tests of OSC tempest>=17.1.0 # Apache-2.0 -Pygments>=2.2.0 # BSD License +python-openstackclient>=5.0.0 # Apache-2.0 +# Usability of venv flake8