Skip to content

Commit a82b292

Browse files
committed
Fix test-matrix, mypy, and bad backport
- test-matrix.yml was intepreting 3.10 as '3.1' via float - mypy recently removed its built-in type stubs for many third-party libraries so now need to install 'types-requests' - Backport of the ELASTIC_CLIENT_APIVERSIONING test case included '8' instead of '7'
1 parent 8438a24 commit a82b292

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.ci/test-matrix.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
STACK_VERSION:
2-
- 7.x-SNAPSHOT
2+
- 7.13-SNAPSHOT
33

44
TEST_SUITE:
55
- platinum
66

77
PYTHON_VERSION:
8-
- 2.7
9-
- 3.4
10-
- 3.5
11-
- 3.6
12-
- 3.7
13-
- 3.8
14-
- 3.9
15-
- 3.10
8+
- "2.7"
9+
- "3.4"
10+
- "3.5"
11+
- "3.6"
12+
- "3.7"
13+
- "3.8"
14+
- "3.9"
15+
- "3.10"
1616

1717
PYTHON_CONNECTION_CLASS:
1818
- Urllib3HttpConnection

noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def format(session):
4747

4848
@nox.session()
4949
def lint(session):
50-
session.install("flake8", "black", "mypy", "isort")
50+
session.install("flake8", "black", "mypy", "isort", "types-requests")
5151

5252
session.run("isort", "--check", "--profile=black", *SOURCE_FILES)
5353
session.run("black", "--target-version=py27", "--check", *SOURCE_FILES)

test_elasticsearch/test_connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def test_compatibility_accept_header(self):
188188
conn = Connection()
189189
assert (
190190
conn.headers["accept"]
191-
== "application/vnd.elasticsearch+json;compatible-with=8"
191+
== "application/vnd.elasticsearch+json;compatible-with=7"
192192
)
193193
finally:
194194
os.environ.pop("ELASTIC_CLIENT_APIVERSIONING")

0 commit comments

Comments
 (0)