From 9e83533fc4c8fce1943994e904ae5490d82cd16d Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 11 Mar 2020 11:20:32 -0500 Subject: [PATCH] Remove fix-tox workaround for python3.5 We had a point-in-time workaround for the importlib issue with tox-py35 that is no longer needed. Change-Id: I5df0dc4ad87e5381c6d15926a6aa6ac332eb4b35 --- .zuul.yaml | 2 -- playbooks/fix-tox.yaml | 8 -------- 2 files changed, 10 deletions(-) delete mode 100644 playbooks/fix-tox.yaml diff --git a/.zuul.yaml b/.zuul.yaml index bf2e80c1d1..d4a4151d52 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -205,7 +205,6 @@ - zuul-tox-docs - tox-pep8 - tox-py35: - pre-run: playbooks/fix-tox.yaml irrelevant-files: - zuul/cmd/migrate.py - playbooks/zuul-migrate/.* @@ -262,7 +261,6 @@ - zuul-tox-docs - tox-pep8 - tox-py35: - pre-run: playbooks/fix-tox.yaml irrelevant-files: - zuul/cmd/migrate.py - playbooks/zuul-migrate/.* diff --git a/playbooks/fix-tox.yaml b/playbooks/fix-tox.yaml deleted file mode 100644 index f786d9bb69..0000000000 --- a/playbooks/fix-tox.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - pre_tasks: - - name: Fix importlib-resources - become: true - shell: | - pip3 install --upgrade importlib-resources==1.0.2 - args: - executable: /bin/bash