Skip to content

Commit

Permalink
Merge branch '1.x' into yunkim/langchain
Browse files Browse the repository at this point in the history
  • Loading branch information
Yun-Kim authored Jun 29, 2023
2 parents 01a7226 + fded2a1 commit 6ce8f0b
Show file tree
Hide file tree
Showing 355 changed files with 1,336 additions and 591 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- [ ] Change is maintainable (easy to change, telemetry, documentation).
- [ ] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`.
- [ ] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)).
- [ ] Backport labels are set (if [applicable](../docs/contributing.rst#release-branch-maintenance))
- [ ] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

Expand All @@ -18,4 +18,4 @@
- [ ] Change is maintainable (easy to change, telemetry, documentation).
- [ ] Release note makes sense to a user of the library.
- [ ] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment.
- [ ] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](../docs/contributing.rst#release-branch-maintenance)
- [ ] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
6 changes: 4 additions & 2 deletions .github/workflows/test_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- suffix: DI coverage
expl_profiler: 0
expl_coverage: 1
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
name: Django 3.1 (with ${{ matrix.suffix }})
env:
DD_PROFILING_ENABLED: true
Expand Down Expand Up @@ -118,7 +118,9 @@ jobs:
python-version: "3.8"
- name: Install pylibmc libmemcached package
# Django-specific: pylibmc in Ubuntu requires libmemcached package
run: sudo apt install libmemcached-dev zlib1g
run: |
sudo apt update -qq
sudo apt install --no-install-recommends -qqyf libmemcached-dev zlib1g
- name: Install dependencies
# Django-specific: separate dependencies for tests
run: pip install -r tests/requirements/py3.txt
Expand Down
35 changes: 26 additions & 9 deletions .riot/requirements/11f2d91.txt → .riot/requirements/100e6c3.txt
Original file line number Diff line number Diff line change
@@ -1,44 +1,61 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11f2d91.in
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/100e6c3.in
#
aiohttp==3.8.4
aiosignal==1.3.1
async-timeout==4.0.2
asynctest==0.13.0
attrs==23.1.0
certifi==2023.5.7
charset-normalizer==3.1.0
coverage[toml]==7.2.7
cycler==0.11.0
et-xmlfile==1.1.0
exceptiongroup==1.1.1
fonttools==4.38.0
frozenlist==1.3.3
hypothesis==6.45.0
idna==3.4
importlib-metadata==6.7.0
iniconfig==2.0.0
joblib==1.2.0
kiwisolver==1.4.4
matplotlib==3.5.3
mock==5.0.2
multidict==6.0.4
numpy==1.24.3
openai==0.26.5
numpy==1.21.6
openai[embeddings]==0.27.2
openpyxl==3.1.2
opentracing==2.4.0
packaging==23.1
pandas==1.3.5
pandas-stubs==1.2.0.62
pillow==9.5.0
pluggy==1.0.0
pytest==7.3.1
plotly==5.15.0
pluggy==1.2.0
pyparsing==3.1.0
pytest==7.4.0
pytest-asyncio==0.21.0
pytest-cov==4.1.0
pytest-mock==3.10.0
pytest-mock==3.11.1
python-dateutil==2.8.2
pytz==2023.3
pyyaml==6.0
requests==2.31.0
scikit-learn==1.2.2
scipy==1.10.1
scikit-learn==1.0.2
scipy==1.7.3
six==1.16.0
sortedcontainers==2.4.0
tenacity==8.2.2
threadpoolctl==3.1.0
tomli==2.0.1
tqdm==4.65.0
typing-extensions==4.7.0
urllib3==1.26.16
vcrpy==4.2.1
wrapt==1.15.0
yarl==1.9.2
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/10212ca.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/102421e.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ sortedcontainers==2.4.0
sshpubkeys==3.3.1
tomli==2.0.1
types-pyyaml==6.0.12.8
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
websocket-client==1.5.1
werkzeug==2.1.2
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/102cf0a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
uwsgi==2.0.21
zipp==3.15.0

Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/1032b18.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ redis==3.5.3
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
vine==5.0.0
wcwidth==0.2.6
zipp==3.15.0
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/103e4a0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ six==1.16.0
sortedcontainers==2.4.0
tenacity==8.2.2
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.16
wrapt==1.15.0
xmltodict==0.13.0
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/1050ad9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ pytest-mock==3.10.0
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/1067092.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ sortedcontainers==2.4.0
sqlalchemy==1.4.46
starlette==0.26.1
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
18 changes: 9 additions & 9 deletions .riot/requirements/107624b.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ async-timeout==4.0.2
attrs==23.1.0
certifi==2023.5.7
charset-normalizer==3.1.0
contourpy==1.0.7
contourpy==1.1.0
coverage[toml]==7.2.7
cycler==0.11.0
et-xmlfile==1.1.0
fonttools==4.39.4
fonttools==4.40.0
frozenlist==1.3.3
hypothesis==6.45.0
idna==3.4
Expand All @@ -24,27 +24,27 @@ kiwisolver==1.4.4
matplotlib==3.7.1
mock==5.0.2
multidict==6.0.4
numpy==1.24.3
numpy==1.25.0
openai[embeddings]==0.27.2
openpyxl==3.1.2
opentracing==2.4.0
packaging==23.1
pandas==2.0.2
pandas-stubs==2.0.2.230605
pillow==9.5.0
plotly==5.14.1
pluggy==1.0.0
pyparsing==3.0.9
pytest==7.3.1
plotly==5.15.0
pluggy==1.2.0
pyparsing==3.1.0
pytest==7.4.0
pytest-asyncio==0.21.0
pytest-cov==4.1.0
pytest-mock==3.10.0
pytest-mock==3.11.1
python-dateutil==2.8.2
pytz==2023.3
pyyaml==6.0
requests==2.31.0
scikit-learn==1.2.2
scipy==1.10.1
scipy==1.11.0
six==1.16.0
sortedcontainers==2.4.0
tenacity==8.2.2
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/10990fb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ pytest-mock==3.10.0
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/10a9168.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ sortedcontainers==2.4.0
sshpubkeys==3.3.1
tomli==2.0.1
types-pyyaml==6.0.12.8
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
websocket-client==1.5.1
werkzeug==2.1.2
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/10b912a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
vine==1.3.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/10cc35f.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
zope-event==4.6
zope-interface==6.0
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/111163f.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/1124194.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ sortedcontainers==2.4.0
sshpubkeys==3.3.1
tomli==2.0.1
types-pyyaml==6.0.12.8
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
websocket-client==1.5.1
werkzeug==2.1.2
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/1133f63.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/1134537.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/116a45d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ sqlparse==0.4.4
tomli==2.0.1
twisted[tls]==22.10.0
txaio==23.1.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
zope-interface==6.0

Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/116c409.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ pytest-mock==3.10.0
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/1182da4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/11b2766.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/11c6a9d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ pytz==2022.7.1
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
vertica-python==0.7.4
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/120f342.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sanic-testing==22.3.1
sniffio==1.3.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
ujson==5.7.0
urllib3==1.26.15
uvloop==0.17.0
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/12115db.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pytest-cov==4.1.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
uwsgi==2.0.21
zipp==3.15.0

Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/12497dd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/1277d97.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/1295177.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ pytest-asyncio==0.21.0
pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
typing-extensions==4.6.3
typing-extensions==4.7.0
2 changes: 1 addition & 1 deletion .riot/requirements/12b2f26.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pytest-mock==3.10.0
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
werkzeug==2.1.2
wrapt==1.15.0
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/12b6c4d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
2 changes: 1 addition & 1 deletion .riot/requirements/12e2d81.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pytest-mock==3.10.0
redis==4.5.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
zope-event==4.6
zope-interface==5.5.2
Expand Down
2 changes: 1 addition & 1 deletion .riot/requirements/130f79e.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/131d266.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
zipp==3.15.0
2 changes: 1 addition & 1 deletion .riot/requirements/132b64a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pytest-mock==3.10.0
requests==2.28.1
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.6.3
typing-extensions==4.7.0
urllib3==1.26.15
werkzeug==2.1.2
wrapt==1.15.0
Expand Down
Loading

0 comments on commit 6ce8f0b

Please sign in to comment.