From b3b0ba42c260935b1d3c3a1db244c1ebc14d40ad Mon Sep 17 00:00:00 2001 From: Benjamin Wohlwend Date: Wed, 10 Apr 2019 16:38:30 +0200 Subject: [PATCH] update CHANGELOG and bump version to 4.2.2 (also snuck in a simplification of local pre-commit hooks) --- .pre-commit-config.yaml | 11 ++++++++--- .pre-commit-hooks.yaml | 7 ------- CHANGELOG.md | 5 +++-- elasticapm/version.py | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 .pre-commit-hooks.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7de3cb35a..ad50090b4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,12 @@ repos: hooks: - id: flake8 exclude: elasticapm\/utils\/wrapt|build|src|tests|dist|conftest.py|setup.py -- repo: https://github.com/elastic/apm-agent-python - rev: 86fca8c04e6d638ed +- repo: local hooks: - - id: license-header-check + - id: license-header-check + name: License header check + description: Checks the existance of license headers in all Python files + entry: ./tests/scripts/license_headers_check.sh + exclude: "(elasticapm\/utils\/wrapt\/.*|tests\/utils\/stacks\/linenos.py)" + language: script + types: [python] diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml deleted file mode 100644 index 474b9a8ed..000000000 --- a/.pre-commit-hooks.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- id: license-header-check - name: License header check - description: Checks the existance of license headers in all Python files - entry: ./tests/scripts/license_headers_check.sh - exclude: "(elasticapm\/utils\/wrapt\/.*|tests\/utils\/stacks\/linenos.py)" - language: script - types: [python] diff --git a/CHANGELOG.md b/CHANGELOG.md index d785860f9..cb7f6890c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # Changelog -## Unreleased -[Check the diff](https://github.com/elastic/apm-agent-python/compare/v4.2.1...master) +## v4.2.2 +[Check the diff](https://github.com/elastic/apm-agent-python/compare/v4.2.1...v4.2.2) * fixed an issue with Celery and the prefork worker pool (#444) * fixed an issue when running uwsgi without a master process (#446) + * fixed an issue with gevent/eventlet on Python 3.7 (#451, #454) * introduced `IntervalTimer` and use it instead of `threading.Timer` (#452) * added license header check as pre-commit hook (#456) diff --git a/elasticapm/version.py b/elasticapm/version.py index eb0821856..10ece7d59 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__ = (4, 2, 1) +__version__ = (4, 2, 2) VERSION = ".".join(map(str, __version__))