Skip to content

Commit

Permalink
update CHANGELOG and bump version to 6.17.0 (elastic#1868)
Browse files Browse the repository at this point in the history
* Update CONTRIBUTING with Github Actions release instructions

* update CHANGELOG and bump version to 6.17.0
  • Loading branch information
basepi committed Jul 4, 2023
1 parent 292588c commit 0eaa44a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
15 changes: 8 additions & 7 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion elasticapm/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__))

0 comments on commit 0eaa44a

Please sign in to comment.