From 0eaa44a199365785c61ffe8a5adcf7b7a58a7a8d Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Tue, 4 Jul 2023 06:22:45 -0600 Subject: [PATCH] update CHANGELOG and bump version to 6.17.0 (#1868) * Update CONTRIBUTING with Github Actions release instructions * update CHANGELOG and bump version to 6.17.0 --- CHANGELOG.asciidoc | 15 ++++++++------- CONTRIBUTING.md | 6 +++--- elasticapm/version.py | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 7d547ff16..b4795c044 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -29,21 +29,22 @@ endif::[] //===== Bug fixes // -=== Unreleased -// Unreleased changes go here -// When the next release happens, nest these changes under the "Python Agent version 6.x" heading +[[release-notes-6.x]] +=== Python Agent version 6.x + +[[release-notes-6.17.0]] +==== 6.17.0 - 2023-07-03 + [float] ==== Features - * Add `server_ca_cert_file` option to provide custom CA certificate {pull}1852[#1852] +* Add `server_ca_cert_file` option to provide custom CA certificate {pull}1852[#1852] +* Add `include_process_args` option to allow users to opt-in to collecting process args {pull}1867[#1867] [float] ===== Bug fixes * Fix a bug in the GRPC instrumentation when reaching the maximum amount of spans per transaction {pull}1861[#1861] -[[release-notes-6.x]] -=== Python Agent version 6.x - [[release-notes-6.16.2]] ==== 6.16.2 - 2023-06-12 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ddde55ff..f31f6c3c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -189,6 +189,6 @@ If you have commit access, the process is as follows: 1. Reset the current major branch (`1.x`, `2.x` etc) to point to the current main, e.g. `git branch -f 1.x main` 1. Push tag upstream with `git push upstream --tags` (and optionally to your own fork as well) 1. Update major branch, e.g. `1.x` on upstream with `git push upstream 1.x` -1. After tests pass, Jenkins will automatically build a source package, as well as binary wheels. -1. Create a [Github release](https://github.com/elastic/apm-agent-python/releases) - targeting the new tag. Copy the changelog into the body of the release. +1. After tests pass, Github Actions will automatically build and push the new release to PyPI. +1. Edit and publish the [draft Github release](https://github.com/elastic/apm-agent-python/releases) + created by Github Actions. Copy the changelog into the body of the release. diff --git a/elasticapm/version.py b/elasticapm/version.py index 828a28b94..0fb7fd9ce 100644 --- a/elasticapm/version.py +++ b/elasticapm/version.py @@ -28,5 +28,5 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = (6, 16, 2) +__version__ = (6, 17, 0) VERSION = ".".join(map(str, __version__))