Resolve conflict

ssl-hep · Nov 23, 2024 · b769ef9 · b769ef9
2 parents eb78820 + 0b5b290
commit b769ef9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,13 +13,13 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ['3.7','3.8','3.9','3.10']
+        python-version: ['3.10','3.11','3.12','3.13']
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@master
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install poetry

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ optional = true
 
 [tool.poetry.group.test.dependencies]
 codecov = "^2.1.12"
-flake8 = "^5.0.4"
+flake8 = "^6.1.0"
 coverage = "^6.5.0"
 pytest-cov = "^4.0.0"
 pytest-mock = "^3.10.0"

diff --git a/tests/test_post_operation.py b/tests/test_post_operation.py
@@ -57,7 +57,7 @@ def test_post_good_query_with_params(self, mocker):
         """Produce code for a simple good query"""
 
         with TemporaryDirectory() as tempdir, \
-                open(os.path.join(tempdir, "baz.txt"), 'w'),\
+                open(os.path.join(tempdir, "baz.txt"), 'w'), \
                 open(os.path.join(tempdir, "foo.txt"), 'w'):
 
             mock_ast_translator = mocker.Mock()
@@ -102,7 +102,7 @@ def test_post_good_query_without_params(self, mocker):
         """Produce code for a simple good query"""
 
         with TemporaryDirectory() as tempdir, \
-                open(os.path.join(tempdir, "baz.txt"), 'w'),\
+                open(os.path.join(tempdir, "baz.txt"), 'w'), \
                 open(os.path.join(tempdir, "foo.txt"), 'w'):
 
             mock_ast_translator = mocker.Mock()