From 93cf534a5cc890053679dda65f1a40cc91a8a64c Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Tue, 22 Nov 2022 14:54:41 +0000
Subject: [PATCH 1/5] unpin flake8

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 0a644671ba..d8b5d03910 100644
--- a/environment.yml
+++ b/environment.yml
@@ -63,7 +63,7 @@ dependencies:
   - xgboost>1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
   - xlsxwriter
   # Python packages needed for testing
-  - flake8 <5
+  - flake8
   - pytest >=3.9,!=6.0.0rc1,!=6.0.0
   - pytest-cov
   - pytest-env

From 65b8988b5a788fdec5a9dfaa3cacb807994929eb Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Tue, 22 Nov 2022 14:54:51 +0000
Subject: [PATCH 2/5] unpin flake8 and remove plugin

---
 environment_osx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment_osx.yml b/environment_osx.yml
index 74c962a198..a2da023883 100644
--- a/environment_osx.yml
+++ b/environment_osx.yml
@@ -63,10 +63,10 @@ dependencies:
   - xgboost>1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
   - xlsxwriter
   # Python packages needed for testing
+  - flake8
   - pytest >=3.9,!=6.0.0rc1,!=6.0.0
   - pytest-cov
   - pytest-env
-  - pytest-flake8
   - pytest-html !=2.1.0
   - pytest-metadata >=1.5.1
   - pytest-xdist

From 8ccc6cd279cee11a42dbe369df195718289a68bb Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Tue, 22 Nov 2022 14:55:03 +0000
Subject: [PATCH 3/5] unpin flake8

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index cde6cc902a..34aa03244a 100755
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@
     # Test dependencies
     # Execute `pip install .[test]` once and the use `pytest` to run tests
     'test': [
-        'flake8<5',  # github.com/ESMValGroup/ESMValCore/issues/1696
+        'flake8',
         'pytest>=3.9,!=6.0.0rc1,!=6.0.0',
         'pytest-cov>=2.10.1',
         'pytest-env',

From febec6a42021e99434e0a333b68cb6ac67c80348 Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Tue, 22 Nov 2022 14:56:09 +0000
Subject: [PATCH 4/5] run a GA test set

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f61929c10..bff517820c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - unpin_flake8
   schedule:
     - cron: '0 0 * * *'
 

From 7b1281b9c8fcdbbc507fac6a6a3d41be0ffb350b Mon Sep 17 00:00:00 2001
From: Valeriu Predoi <valeriu.predoi@gmail.com>
Date: Tue, 22 Nov 2022 15:32:14 +0000
Subject: [PATCH 5/5] no more GA

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bff517820c..7f61929c10 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,6 @@ on:
   push:
     branches:
       - main
-      - unpin_flake8
   schedule:
     - cron: '0 0 * * *'