Merge 1.6.x branch that we created to release 1.6.1.

Spomotion · Aug 16, 2019 · 7d6d0a7 · 7d6d0a7
1 parent 2b5941e
commit 7d6d0a7
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,27 +1,36 @@
 # https://travis-ci.org/jazzband/django-push-notifications
 sudo: false
 language: python
-python: "3.7"
+python:
+- 2.7
+- 3.6
+- 3.7
+cache: pip
 dist: xenial
-
-env:
-  - TOXENV=py27-django111
-  - TOXENV=py37-django111
-  - TOXENV=py37-django20
-  - TOXENV=py37-django22
-  - TOXENV=flake8
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - $TRAVIS_BUILD_DIR/.tox
-
-install:
-  - pip install tox
-
-script:
-  - tox
-
+install: travis_retry pip install tox-travis
+script: tox
+stages:
+- test
+- name: deploy
+  if: repo = jazzband/django-push-notifications AND tag IS present
+jobs:
+  include:
+  - stage: test
+  - stage: deploy
+    install: skip
+    script: skip
+    python: 3.7
+    env: skip
+    deploy:
+      provider: pypi
+      user: jazzband
+      server: https://jazzband.co/projects/django-push-notifications/upload
+      distributions: sdist bdist_wheel
+      password:
+        secure: ICRZGeqLWsqEtg9Iz62SHGOktUQEN+8h4wp0RKJJhcPIj59aKJNV+ET1wM+Xsh6OgpX2Ddy2AF7vD7pDP8kbWyCVyQNeK2/Ejo9SC7tVaVUIf5VAFXmkMymlAwUc6lKYrLW2Ls4PEqvSKikHcHp20pna6jJvg0Msa11j/KYP9eM=
+      on:
+        tags: true
+        repo: jazzband/django-push-notifications
 notifications:
   email:
     on_failure: always

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,11 @@
 * BUGFIX: Fix `Push failed: 403 fobidden` error when sending message to Chrome WebPushDevice
 
 
+## 1.6.1 (2019-08-16)
+* Pin dependency to apns to <0.6.0 to fix a Python version
+  incompatibility.
+* Add configuration for semi-automatic releases via Jazzband.
+
 ## 1.6.0 (2018-01-31)
 * BACKWARDS-INCOMPATIBLE: Drop support for Django < 1.11
 * DJANGO: Support Django 2.0

diff --git a/setup.cfg b/setup.cfg
@@ -27,7 +27,7 @@ classifiers =
 [options]
 packages = find:
 install_requires =
-	apns2>=0.3.0
+	apns2>=0.3.0,<0.6.0
 	pywebpush>=1.3.0
 	Django>=1.11
 

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
 	py27-django111
 	py37-django{111,20,22}
-	flake8
+	py37-flake8
 
 [testenv]
 setenv =
@@ -18,10 +18,9 @@ deps =
 	django111: Django>=1.11,<2.0
 	django20: Django>=2.0,<2.1
 	django22: Django>=2.2
-    apns2>=0.3.0
 
-[testenv:flake8]
-commands = flake8
+[testenv:py37-flake8]
+commands = flake8 --exit-zero
 deps =
 	flake8==3.5.0
 	flake8-isort