Skip to content

Commit

Permalink
Merge branch 'main' into pymemcache_instruments_version_bump
Browse files Browse the repository at this point in the history
  • Loading branch information
srikanthccv authored Mar 1, 2022
2 parents a057f7c + ca5a4a1 commit 7f1c560
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ readme-renderer~=24.0
grpcio-tools==1.29.0
mypy-protobuf>=1.23
protobuf>=3.13.0
markupsafe==2.0.1
2 changes: 2 additions & 0 deletions docs-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ sqlalchemy>=1.0
tornado>=5.1.1
ddtrace>=0.34.0
httpx>=0.18.0
markupsafe==2.0.1
itsdangerous==2.0.1
1 change: 1 addition & 0 deletions gen-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-c dev-requirements.txt
astor==0.8.1
jinja2~=2.7
markupsafe==2.0.1
isort
black
requests
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ install_requires =
test =
moto~=2.0
opentelemetry-test-utils == 0.28b1
markupsafe==2.0.1

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ install_requires =
test =
moto[all] ~= 2.2.6
opentelemetry-test-utils == 0.28b1
markupsafe==2.0.1

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ install_requires =
[options.extras_require]
test =
opentelemetry-test-utils == 0.28b1
markupsafe==2.0.1

[options.entry_points]
opentelemetry_instrumentor =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ install_requires =
[options.extras_require]
test =
opentelemetry-test-utils == 0.28b1
markupsafe==2.0.1

[options.packages.find]
where = src
Expand Down

0 comments on commit 7f1c560

Please sign in to comment.