Skip to content

Commit c43daa2

Browse files
authored
Merge branch 'master' into fix-1133
2 parents 71b0910 + 4b7ce05 commit c43daa2

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎tests/bdd/api_key_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
scenarios(os.path.join("features", "api_key.feature"))
4141

4242

43-
@given("an agent")
43+
@given("an agent", target_fixture="an_agent")
4444
def an_agent(elasticapm_client):
4545
return elasticapm_client
4646

‎tests/requirements/reqs-base.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
pytest==6.2.2
2-
pytest-django==4.1.0
3-
coverage==5.4
4-
pytest-cov==2.11.1
1+
pytest==6.2.4
2+
pytest-django==4.3.0
3+
coverage==5.5
4+
pytest-cov==2.12.0
55
pytest-localserver==0.5.0
6-
pytest-mock==3.5.1
7-
pytest-benchmark==3.2.3
8-
pytest-bdd==3.4.0
6+
pytest-mock==3.6.1
7+
pytest-benchmark==3.4.1
8+
pytest-bdd==4.0.2
99
pytest-rerunfailures==9.1.1
1010
jsonschema==3.2.0
1111

1212

1313
py==1.10.0
14-
more-itertools==8.6.0
14+
more-itertools==8.7.0
1515
pluggy==0.13.1
1616
atomicwrites==1.4.0
1717
pyrsistent==0.17.3
18-
configparser==5.0.1
18+
configparser==5.0.2
1919
contextlib2==0.6.0
20-
importlib-metadata==3.4.0
20+
importlib-metadata==4.0.1
2121
packaging==20.9
2222
Mako==1.1.4
2323
glob2==0.7
2424
parse==1.19.0
2525
parse-type==0.5.2
2626
toml==0.10.2
2727
iniconfig==1.1.1
28-
docutils==0.16
29-
py-cpuinfo==7.0.0
28+
docutils==0.17.1
29+
py-cpuinfo==8.0.0
3030
statistics==1.0.3.5
3131

3232
urllib3
@@ -49,5 +49,5 @@ ecs_logging
4949
structlog
5050

5151

52-
pytest-asyncio==0.14.0 ; python_version >= '3.7'
52+
pytest-asyncio==0.15.1 ; python_version >= '3.7'
5353
asynctest==0.13.0 ; python_version >= '3.7'

0 commit comments

Comments
 (0)