Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-pymysql-version
Browse files Browse the repository at this point in the history
  • Loading branch information
quinna-h authored Aug 27, 2024
2 parents a755a66 + a1a5a09 commit 12c27bb
Show file tree
Hide file tree
Showing 132 changed files with 1,889 additions and 1,432 deletions.
8 changes: 6 additions & 2 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@ commands:
setup_hatch:
description: "Install hatch"
steps:
- run: pip3 install hatch~=1.8.0 hatch-containers==0.7.0
- run:
name: "Install hatch"
command: |
curl -L https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-x86_64-unknown-linux-gnu.tar.gz | tar zx
sudo install -t /usr/local/bin hatch
hatch -q
start_docker_services:
description: "Start Docker services"
Expand Down Expand Up @@ -1345,7 +1350,6 @@ jobs:
# build documentation and store as an artifact
executor: ddtrace_dev
steps:
- setup_hatch
- checkout
- run:
command: |
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ tests/ci_visibility @DataDog/ci-app-libraries
tests/coverage @DataDog/apm-core-python @DataDog/ci-app-libraries
tests/tracer/test_ci.py @DataDog/ci-app-libraries
ddtrace/ext/git.py @DataDog/ci-app-libraries @DataDog/apm-core-python
scripts/ci_visibility/* @DataDog/ci-app-libraries

# Debugger
ddtrace/debugging/ @DataDog/debugger-python
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/generate-package-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Generate Package Versions
on:
workflow_dispatch: # can be triggered manually
schedule:
- cron: '0 0 * * 0' # weekly on Sunday at midnight

- cron: "0 0 * * 0" # weekly on Sunday at midnight

jobs:
generate-package-versions:
Expand Down Expand Up @@ -32,7 +31,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Setup Python 3.11
uses: actions/setup-python@v5
with:
Expand All @@ -42,6 +41,9 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand All @@ -54,18 +56,22 @@ jobs:
- name: Start docker service
run: docker-compose up -d testagent

- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y libmariadb-dev
- name: Install hatch
uses: pypa/hatch@install
with:
version: "1.12.0"

- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install packaging
pip install riot==0.19.1
pip install hatch~=1.8.0 hatch-containers==0.7.0
- name: Run regenerate-riot-latest
run: scripts/regenerate-riot-latest.sh
Expand All @@ -80,5 +86,5 @@ jobs:
delete-branch: true
base: main
title: "chore: update ${{ env.VENV_NAME }} latest version"
body: |
Updates the ${{ env.VENV_NAME }} integration latest version and regenerates lockfiles.
labels: changelog/no-changelog
body-path: .github/PULL_REQUEST_TEMPLATE.md
4 changes: 3 additions & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ jobs:
run: rustup update stable && rustup default stable && rustup component add rustfmt clippy

- name: Install hatch
run: pip install hatch
uses: pypa/hatch@install
with:
version: "1.12.0"

- name: Run tests
run: hatch run ddtrace_unit_tests:test
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ include:
- local: ".gitlab/tests.yml"
- local: ".gitlab/macrobenchmarks.yml"
- local: ".gitlab/dogfood.yml"
- local: ".gitlab/release.yml"

package-oci:
needs: [ download_dependency_wheels, download_ddtrace_artifacts ]
Expand Down
17 changes: 0 additions & 17 deletions .gitlab/dogfood.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
dogfood-dogweb-failed:
stage: dogfood
tags: ["arch:amd64"]
needs: ["dogfood-dogweb-trigger"]
when: on_failure
script:
- exit 0

dogfood-dogweb:
stage: dogfood
tags: ["arch:amd64"]
needs: ["dogfood-dogweb-trigger"]
when: on_success
script:
- exit 0

dogfood-dogweb-trigger:
stage: dogfood
trigger:
project: DataDog/dogweb
strategy: depend
branch: emmett.butler/ddtrace-unstable-dogfooding
allow_failure: true
needs: []
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ variables:

release_pypi_test:
extends: .release_pypi
dependencies: [ "download_ddtrace_wheels" ]
dependencies: [ "download_ddtrace_artifacts" ]
variables:
PYPI_REPOSITORY: testpypi

Expand Down
4 changes: 3 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ build:
python: "3.10"
commands:
- git fetch --unshallow || true
- pip install hatch~=1.8.0 hatch-containers==0.7.0
- curl -L https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-x86_64-unknown-linux-gnu.tar.gz | tar zx
- install -t /usr/local/bin hatch
- hatch -q
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
- echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> "$BASH_ENV"
- hatch -v run docs:sphinx-build -W -b html docs docs/_build/html
Expand Down
18 changes: 9 additions & 9 deletions .riot/requirements/10ebb4e.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.7
# by the following command:
#
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/10ebb4e.in
# pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/10ebb4e.in
#
aiobotocore==1.4.2
aiohttp==3.8.6
Expand All @@ -11,33 +11,33 @@ aiosignal==1.3.1
async-generator==1.10
async-timeout==4.0.3
asynctest==0.13.0
attrs==23.1.0
attrs==24.2.0
botocore==1.20.106
charset-normalizer==3.3.2
coverage[toml]==7.2.7
exceptiongroup==1.2.0
exceptiongroup==1.2.2
frozenlist==1.3.3
hypothesis==6.45.0
idna==3.6
idna==3.8
importlib-metadata==6.7.0
iniconfig==2.0.0
jmespath==0.10.0
mock==5.1.0
multidict==6.0.4
multidict==6.0.5
opentracing==2.4.0
packaging==23.2
packaging==24.0
pluggy==1.2.0
pytest==7.4.3
pytest==7.4.4
pytest-asyncio==0.21.1
pytest-cov==4.1.0
pytest-mock==3.11.1
pytest-randomly==3.12.0
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.7.1
urllib3==1.26.18
urllib3==1.26.19
wrapt==1.16.0
yarl==1.9.4
zipp==3.15.0
40 changes: 20 additions & 20 deletions .riot/requirements/11031a2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,45 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/11031a2.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/11031a2.in
#
annotated-types==0.7.0
anthropic==0.28.0
anthropic==0.34.1
anyio==4.4.0
attrs==23.2.0
certifi==2024.6.2
attrs==24.2.0
certifi==2024.7.4
charset-normalizer==3.3.2
coverage[toml]==7.5.3
coverage[toml]==7.6.1
distro==1.9.0
filelock==3.14.0
fsspec==2024.6.0
filelock==3.15.4
fsspec==2024.6.1
h11==0.14.0
httpcore==1.0.5
httpx==0.27.0
huggingface-hub==0.23.2
huggingface-hub==0.24.6
hypothesis==6.45.0
idna==3.7
idna==3.8
iniconfig==2.0.0
jiter==0.4.1
jiter==0.5.0
mock==5.1.0
multidict==6.0.5
opentracing==2.4.0
packaging==24.0
packaging==24.1
pluggy==1.5.0
pydantic==2.7.3
pydantic-core==2.18.4
pytest==8.2.2
pytest-asyncio==0.23.7
pydantic==2.8.2
pydantic-core==2.20.1
pytest==8.3.2
pytest-asyncio==0.24.0
pytest-cov==5.0.0
pytest-mock==3.14.0
pyyaml==6.0.1
pyyaml==6.0.2
requests==2.32.3
sniffio==1.3.1
sortedcontainers==2.4.0
tokenizers==0.19.1
tqdm==4.66.4
typing-extensions==4.12.1
urllib3==2.2.1
tokenizers==0.20.0
tqdm==4.66.5
typing-extensions==4.12.2
urllib3==2.2.2
vcrpy==6.0.1
wrapt==1.16.0
yarl==1.9.4
20 changes: 10 additions & 10 deletions .riot/requirements/121f3e0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/121f3e0.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/121f3e0.in
#
aiofiles==24.1.0
anyio==4.4.0
attrs==23.2.0
attrs==24.2.0
certifi==2024.7.4
charset-normalizer==3.3.2
coverage[toml]==7.6.0
exceptiongroup==1.2.1
coverage[toml]==7.6.1
exceptiongroup==1.2.2
fastapi==0.64.0
h11==0.14.0
httpcore==1.0.5
httpx==0.27.0
httpx==0.27.2
hypothesis==6.45.0
idna==3.7
importlib-metadata==8.0.0
idna==3.8
importlib-metadata==8.4.0
iniconfig==2.0.0
mock==5.1.0
opentracing==2.4.0
packaging==24.1
pluggy==1.5.0
pydantic==1.10.17
pytest==8.2.2
pydantic==1.10.18
pytest==8.3.2
pytest-asyncio==0.21.1
pytest-cov==5.0.0
pytest-mock==3.14.0
Expand All @@ -36,4 +36,4 @@ starlette==0.13.6
tomli==2.0.1
typing-extensions==4.12.2
urllib3==2.2.2
zipp==3.19.2
zipp==3.20.1
20 changes: 10 additions & 10 deletions .riot/requirements/13804af.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/13804af.in
# pip-compile --allow-unsafe --no-annotate .riot/requirements/13804af.in
#
annotated-types==0.7.0
anyio==4.4.0
attrs==23.2.0
attrs==24.2.0
certifi==2024.7.4
charset-normalizer==3.3.2
coverage[toml]==7.6.0
coverage[toml]==7.6.1
distro==1.9.0
exceptiongroup==1.2.2
h11==0.14.0
httpcore==1.0.5
httpx==0.27.0
hypothesis==6.45.0
idna==3.7
importlib-metadata==8.0.0
idna==3.8
importlib-metadata==8.4.0
iniconfig==2.0.0
mock==5.1.0
multidict==6.0.5
Expand All @@ -31,27 +31,27 @@ pillow==10.1.0
pluggy==1.5.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
pytz==2024.1
pyyaml==6.0.1
regex==2024.5.15
pyyaml==6.0.2
regex==2024.7.24
requests==2.32.3
six==1.16.0
sniffio==1.3.1
sortedcontainers==2.4.0
tiktoken==0.7.0
tomli==2.0.1
tqdm==4.66.4
tqdm==4.66.5
types-pytz==2024.1.0.20240417
typing-extensions==4.12.2
tzdata==2024.1
urllib3==1.26.19
vcrpy==4.2.1
wrapt==1.16.0
yarl==1.9.4
zipp==3.19.2
zipp==3.20.1
Loading

0 comments on commit 12c27bb

Please sign in to comment.