From dd661e97287789ce7aee241d91b456706be3227f Mon Sep 17 00:00:00 2001 From: Brian May Date: Tue, 16 Mar 2021 08:07:54 +1100 Subject: [PATCH 1/2] Bump pyflakes from 2.2.0 to 2.3.0, flake8 from 3.8.4 to 3.9.0 Bumps [pyflakes](https://github.com/PyCQA/pyflakes) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/PyCQA/pyflakes/releases) - [Changelog](https://github.com/PyCQA/pyflakes/blob/master/NEWS.rst) - [Commits](https://github.com/PyCQA/pyflakes/compare/2.2.0...2.3.0) Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.8.4 to 3.9.0. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.4...3.9.0) --- requirements-tests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-tests.txt b/requirements-tests.txt index dd12e35..89c848e 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -1,5 +1,5 @@ -r requirements.txt pytest==6.2.2 pytest-cov==2.11.1 -flake8==3.8.4 -pyflakes==2.2.0 +flake8==3.9.0 +pyflakes==2.3.0 From 97076a9390566a0fb396d2f1ae5de29760d886d6 Mon Sep 17 00:00:00 2001 From: Brian May Date: Tue, 16 Mar 2021 08:28:54 +1100 Subject: [PATCH 2/2] Adjust branches, remove temporary branches --- .github/workflows/pythonpackage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 3335508..d2deece 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -5,11 +5,11 @@ name: Python package on: push: - branches: [ master, tproxy_mark_param ] + branches: [ master ] pull_request: - branches: [ master, tproxy_mark_param ] + branches: [ master ] workflow_dispatch: - branches: [ tproxy_mark_param ] + branches: [ master ] jobs: build: