Skip to content

Commit b769ef9

Browse files
committed
Resolve conflict
2 parents eb78820 + 0b5b290 commit b769ef9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
test:
1414
strategy:
1515
matrix:
16-
python-version: ['3.7','3.8','3.9','3.10']
16+
python-version: ['3.10','3.11','3.12','3.13']
1717
runs-on: ubuntu-latest
1818

1919
steps:
2020
- uses: actions/checkout@master
2121
- name: Set up Python ${{ matrix.python-version }}
22-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v4
2323
with:
2424
python-version: ${{ matrix.python-version }}
2525
- name: Install poetry

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ optional = true
2222

2323
[tool.poetry.group.test.dependencies]
2424
codecov = "^2.1.12"
25-
flake8 = "^5.0.4"
25+
flake8 = "^6.1.0"
2626
coverage = "^6.5.0"
2727
pytest-cov = "^4.0.0"
2828
pytest-mock = "^3.10.0"

tests/test_post_operation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_post_good_query_with_params(self, mocker):
5757
"""Produce code for a simple good query"""
5858

5959
with TemporaryDirectory() as tempdir, \
60-
open(os.path.join(tempdir, "baz.txt"), 'w'),\
60+
open(os.path.join(tempdir, "baz.txt"), 'w'), \
6161
open(os.path.join(tempdir, "foo.txt"), 'w'):
6262

6363
mock_ast_translator = mocker.Mock()
@@ -102,7 +102,7 @@ def test_post_good_query_without_params(self, mocker):
102102
"""Produce code for a simple good query"""
103103

104104
with TemporaryDirectory() as tempdir, \
105-
open(os.path.join(tempdir, "baz.txt"), 'w'),\
105+
open(os.path.join(tempdir, "baz.txt"), 'w'), \
106106
open(os.path.join(tempdir, "foo.txt"), 'w'):
107107

108108
mock_ast_translator = mocker.Mock()

0 commit comments

Comments
 (0)