Code

Sync 6.x with 6.22.0#2025

Code

Merged

xrmx merged 11 commits intoelastic:6.xelastic/apm-agent-python:6.xfrom xrmx:sync622xrmx/apm-agent-python:sync622Copy head branch name to clipboardApr 4, 2024

+242-30

Commits

Commits on Apr 3, 2024

• docs: Add Django 4.2 and 5.0 to supported (elastic#2010)

  xrmx

  committed
  dc47433

  Copy full SHA for dc47433

• ci: add Flask 2.1+ and 3.0 to matrix (elastic#2011)

  xrmx

  committed
  82deddc

  Copy full SHA for 82deddc

• CONTRIBUTING: add more hints on what is required to cut a release (elastic#1989)

  Show description for f692089
  xrmx

  committed
  f692089

  Copy full SHA for f692089

• fix: only set ELASTIC_CI_POST_VERSION when needed (Closes elastic#2015) (elastic#2016)

  Show description for 9d6f615
  

  amannocci

  authored and

  xrmx

  committed
  9d6f615

  Copy full SHA for 9d6f615

• build(deps): bump the github-actions group with 1 update (elastic#2013)

  Show description for 622c78f
  

  dependabot[bot]

  authored and

  xrmx

  committed
  622c78f

  Copy full SHA for 622c78f

• Add ability to override default serialization (elastic#2018)

  Show description for 8b733ec
  xrmx

  committed
  8b733ec

  Copy full SHA for 8b733ec

• tests/client: fix pytest mark skipif syntax (elastic#2019)

  Show description for 9e4059d
  xrmx

  committed
  9e4059d

  Copy full SHA for 9e4059d

• tests: require Werkzeug < 3 for flask 2.0 tests (elastic#2020)

  Show description for 3614cf3
  xrmx

  committed
  3614cf3

  Copy full SHA for 3614cf3

• Use docker compose subcommand instead of docker-compose (elastic#2022)

  xrmx

  committed
  efeff7c

  Copy full SHA for efeff7c

• Remove vendored wrapt references (elastic#2021)

  xrmx

  committed
  eebbd8a

  Copy full SHA for eebbd8a

• update CHANGELOG and bump version to 6.22.0 (elastic#2023)

  xrmx

  committed
  5128f50

  Copy full SHA for 5128f50