Merge remote-tracking branch 'upstream/master' into rm-six

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.14.0
+current_version = 1.15.0
 commit = True
 tag = True
 tag_name = {new_version}

.github/workflows/main.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install tox codecov
+      - name: Run tests
+        run: tox -e py
+      - name: Run docs and formatting tests
+        if: ${{ matrix.python-version == 3.9 }}
+        run: |
+          tox -e docs
+          tox -e pep8
+      - name: Upload coverage.xml to codecov
+        if: ${{ matrix.python-version == 3.9 }}
+        uses: codecov/codecov-action@v1

.github/workflows/publish.yml

@@ -0,0 +1,27 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools wheel twine
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          python setup.py sdist bdist_wheel
+          twine upload dist/*

CHANGES.rst

@@ -1,6 +1,11 @@
 Release notes
 =============
 
+1.15.0 (2021-04-06)
+-------------------
+- feature: Improve content of Sentry messages (`PR#279 <https://github.com/scrapinghub/spidermon/pull/279>`_)
+- bug: Replace `boto` with `boto3` for Amazon SES work correctly (`issue#285 <https://github.com/scrapinghub/spidermon/issues/285>`_)
+
 1.14.0 (2020-10-05)
 -------------------
 - feature: Built-in monitor for field and item coverage (`issue#253 <https://github.com/scrapinghub/spidermon/issues/253>`_)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) Scrapinghub
+Copyright (c) Zyte
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.rst

@@ -2,9 +2,9 @@
 Spidermon
 =========
 
-.. image:: https://img.shields.io/travis/scrapinghub/spidermon/master
-    :target: https://travis-ci.org/scrapinghub/spidermon
-    :alt: travis build status master branch
+.. image:: https://github.com/scrapinghub/spidermon/workflows/CI/badge.svg?branch=master
+    :target: https://github.com/scrapinghub/spidermon/actions?workflow=CI
+    :alt: CI Status
 
 .. image:: https://img.shields.io/codecov/c/github/scrapinghub/spidermon.svg
     :target: http://codecov.io/github/scrapinghub/spidermon?branch=master