Skip to content

Commit

Permalink
Merge branch '2.10' into yunkim/backport-9759-to-210
Browse files Browse the repository at this point in the history
  • Loading branch information
Yun-Kim committed Jul 25, 2024
2 parents 2372b8f + 8364700 commit e95ced3
Show file tree
Hide file tree
Showing 60 changed files with 952 additions and 185 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ tests/internal/test_module.py @DataDog/debugger-python @DataDog/apm-core-p
tests/internal/symbol_db/ @DataDog/debugger-python

# ASM
benchmarks/appsec* @DataDog/asm-python
ddtrace/appsec/ @DataDog/asm-python
ddtrace/settings/asm.py @DataDog/asm-python
ddtrace/contrib/subprocess/ @DataDog/asm-python
Expand Down Expand Up @@ -119,6 +120,7 @@ mypy.ini @DataDog/python-guild @DataDog/apm-core-pyt
.github/ISSUE_TEMPLATE.md @DataDog/python-guild @DataDog/apm-core-python
.github/CODEOWNERS @DataDog/python-guild @DataDog/apm-core-python
.github/workflows/system-tests.yml @DataDog/python-guild @DataDog/apm-core-python
ddtrace/internal/_file_queue.py @DataDog/python-guild
ddtrace/internal/_unpatched.py @DataDog/python-guild
ddtrace/internal/compat.py @DataDog/python-guild @DataDog/apm-core-python
tests/utils.py @DataDog/python-guild
44 changes: 44 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: UnitTests

on:
push:
branches:
- main
pull_request:
workflow_dispatch: {}

jobs:
unit-tests:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
archs: x86_64 i686
#- os: arm-4core-linux
# archs: aarch64
- os: windows-latest
archs: AMD64 x86
- os: macos-latest
archs: arm64
steps:
- uses: actions/checkout@v4
# Include all history and tags
with:
fetch-depth: 0

- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.12'

- uses: actions-rust-lang/setup-rust-toolchain@v1
- name: Install latest stable toolchain and rustfmt
run: rustup update stable && rustup default stable && rustup component add rustfmt clippy

- name: Install hatch
run: pip install hatch

- name: Run tests
run: hatch run ddtrace_unit_tests:test
23 changes: 12 additions & 11 deletions .riot/requirements/18f914e.txt → .riot/requirements/1930a28.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/18f914e.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1930a28.in
#
ai21==2.9.2
ai21-tokenizer==0.11.2
Expand All @@ -12,11 +12,11 @@ annotated-types==0.7.0
anthropic==0.31.2
anyio==4.4.0
attrs==23.2.0
boto3==1.34.145
botocore==1.34.145
boto3==1.34.148
botocore==1.34.148
certifi==2024.7.4
charset-normalizer==3.3.2
cohere==5.6.1
cohere==5.6.2
coverage[toml]==7.6.0
dataclasses-json==0.6.7
defusedxml==0.7.1
Expand All @@ -31,7 +31,7 @@ h11==0.14.0
httpcore==1.0.5
httpx==0.27.0
httpx-sse==0.4.0
huggingface-hub==0.24.0
huggingface-hub==0.24.2
hypothesis==6.45.0
idna==3.7
iniconfig==2.0.0
Expand All @@ -45,34 +45,35 @@ langchain-aws==0.1.6
langchain-cohere==0.1.8
langchain-core==0.2.0
langchain-openai==0.1.7
langchain-pinecone==0.1.2
langchain-pinecone==0.1.3
langchain-text-splitters==0.2.1
langsmith==0.1.92
langsmith==0.1.93
marshmallow==3.21.3
mock==5.1.0
multidict==6.0.5
mypy-extensions==1.0.0
numexpr==2.10.1
numpy==1.26.4
openai==1.35.15
openai==1.37.0
opentracing==2.4.0
orjson==3.10.6
packaging==23.2
parameterized==0.9.0
pinecone-client==4.1.2
pinecone-client==5.0.0
pinecone-plugin-inference==1.0.2
pinecone-plugin-interface==0.0.7
pluggy==1.5.0
psutil==6.0.0
pydantic==2.8.2
pydantic-core==2.20.1
pytest==8.2.2
pytest==8.3.2
pytest-asyncio==0.21.1
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
pyyaml==6.0.1
regex==2024.5.15
regex==2024.7.24
requests==2.32.3
s3transfer==0.10.2
sentencepiece==0.2.0
Expand Down
25 changes: 13 additions & 12 deletions .riot/requirements/14d34ef.txt → .riot/requirements/45c150f.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/14d34ef.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/45c150f.in
#
ai21==2.9.2
ai21-tokenizer==0.11.2
Expand All @@ -13,11 +13,11 @@ anthropic==0.31.2
anyio==4.4.0
async-timeout==4.0.3
attrs==23.2.0
boto3==1.34.145
botocore==1.34.145
boto3==1.34.148
botocore==1.34.148
certifi==2024.7.4
charset-normalizer==3.3.2
cohere==5.6.1
cohere==5.6.2
coverage[toml]==7.6.0
dataclasses-json==0.6.7
defusedxml==0.7.1
Expand All @@ -32,10 +32,10 @@ h11==0.14.0
httpcore==1.0.5
httpx==0.27.0
httpx-sse==0.4.0
huggingface-hub==0.24.0
huggingface-hub==0.24.2
hypothesis==6.45.0
idna==3.7
importlib-metadata==8.0.0
importlib-metadata==8.2.0
iniconfig==2.0.0
jiter==0.5.0
jmespath==1.0.1
Expand All @@ -47,34 +47,35 @@ langchain-aws==0.1.6
langchain-cohere==0.1.8
langchain-core==0.2.0
langchain-openai==0.1.7
langchain-pinecone==0.1.2
langchain-pinecone==0.1.3
langchain-text-splitters==0.2.1
langsmith==0.1.92
langsmith==0.1.93
marshmallow==3.21.3
mock==5.1.0
multidict==6.0.5
mypy-extensions==1.0.0
numexpr==2.10.1
numpy==1.26.4
openai==1.35.15
openai==1.37.0
opentracing==2.4.0
orjson==3.10.6
packaging==23.2
parameterized==0.9.0
pinecone-client==4.1.2
pinecone-client==5.0.0
pinecone-plugin-inference==1.0.2
pinecone-plugin-interface==0.0.7
pluggy==1.5.0
psutil==6.0.0
pydantic==2.8.2
pydantic-core==2.20.1
pytest==8.2.2
pytest==8.3.2
pytest-asyncio==0.21.1
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
pyyaml==6.0.1
regex==2024.5.15
regex==2024.7.24
requests==2.32.3
s3transfer==0.10.2
sentencepiece==0.2.0
Expand Down
23 changes: 12 additions & 11 deletions .riot/requirements/1d9420f.txt → .riot/requirements/b6ac170.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/1d9420f.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/b6ac170.in
#
ai21==2.9.2
ai21-tokenizer==0.11.2
Expand All @@ -13,11 +13,11 @@ anthropic==0.31.2
anyio==4.4.0
async-timeout==4.0.3
attrs==23.2.0
boto3==1.34.145
botocore==1.34.145
boto3==1.34.148
botocore==1.34.148
certifi==2024.7.4
charset-normalizer==3.3.2
cohere==5.6.1
cohere==5.6.2
coverage[toml]==7.6.0
dataclasses-json==0.6.7
defusedxml==0.7.1
Expand All @@ -32,7 +32,7 @@ h11==0.14.0
httpcore==1.0.5
httpx==0.27.0
httpx-sse==0.4.0
huggingface-hub==0.24.0
huggingface-hub==0.24.2
hypothesis==6.45.0
idna==3.7
iniconfig==2.0.0
Expand All @@ -46,34 +46,35 @@ langchain-aws==0.1.6
langchain-cohere==0.1.8
langchain-core==0.2.0
langchain-openai==0.1.7
langchain-pinecone==0.1.2
langchain-pinecone==0.1.3
langchain-text-splitters==0.2.1
langsmith==0.1.92
langsmith==0.1.93
marshmallow==3.21.3
mock==5.1.0
multidict==6.0.5
mypy-extensions==1.0.0
numexpr==2.10.1
numpy==1.26.4
openai==1.35.15
openai==1.37.0
opentracing==2.4.0
orjson==3.10.6
packaging==23.2
parameterized==0.9.0
pinecone-client==4.1.2
pinecone-client==5.0.0
pinecone-plugin-inference==1.0.2
pinecone-plugin-interface==0.0.7
pluggy==1.5.0
psutil==6.0.0
pydantic==2.8.2
pydantic-core==2.20.1
pytest==8.2.2
pytest==8.3.2
pytest-asyncio==0.21.1
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
pyyaml==6.0.1
regex==2024.5.15
regex==2024.7.24
requests==2.32.3
s3transfer==0.10.2
sentencepiece==0.2.0
Expand Down
Loading

0 comments on commit e95ced3

Please sign in to comment.