Skip to content

Commit 7d6d0a7

Browse files
committed
Merge 1.6.x branch that we created to release 1.6.1.
1 parent 2b5941e commit 7d6d0a7

File tree

4 files changed

+38
-25
lines changed

4 files changed

+38
-25
lines changed

.travis.yml

+29-20
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,36 @@
11
# https://travis-ci.org/jazzband/django-push-notifications
22
sudo: false
33
language: python
4-
python: "3.7"
4+
python:
5+
- 2.7
6+
- 3.6
7+
- 3.7
8+
cache: pip
59
dist: xenial
6-
7-
env:
8-
- TOXENV=py27-django111
9-
- TOXENV=py37-django111
10-
- TOXENV=py37-django20
11-
- TOXENV=py37-django22
12-
- TOXENV=flake8
13-
14-
cache:
15-
directories:
16-
- $HOME/.cache/pip
17-
- $TRAVIS_BUILD_DIR/.tox
18-
19-
install:
20-
- pip install tox
21-
22-
script:
23-
- tox
24-
10+
install: travis_retry pip install tox-travis
11+
script: tox
12+
stages:
13+
- test
14+
- name: deploy
15+
if: repo = jazzband/django-push-notifications AND tag IS present
16+
jobs:
17+
include:
18+
- stage: test
19+
- stage: deploy
20+
install: skip
21+
script: skip
22+
python: 3.7
23+
env: skip
24+
deploy:
25+
provider: pypi
26+
user: jazzband
27+
server: https://jazzband.co/projects/django-push-notifications/upload
28+
distributions: sdist bdist_wheel
29+
password:
30+
secure: ICRZGeqLWsqEtg9Iz62SHGOktUQEN+8h4wp0RKJJhcPIj59aKJNV+ET1wM+Xsh6OgpX2Ddy2AF7vD7pDP8kbWyCVyQNeK2/Ejo9SC7tVaVUIf5VAFXmkMymlAwUc6lKYrLW2Ls4PEqvSKikHcHp20pna6jJvg0Msa11j/KYP9eM=
31+
on:
32+
tags: true
33+
repo: jazzband/django-push-notifications
2534
notifications:
2635
email:
2736
on_failure: always

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
* BUGFIX: Fix `Push failed: 403 fobidden` error when sending message to Chrome WebPushDevice
1111

1212

13+
## 1.6.1 (2019-08-16)
14+
* Pin dependency to apns to <0.6.0 to fix a Python version
15+
incompatibility.
16+
* Add configuration for semi-automatic releases via Jazzband.
17+
1318
## 1.6.0 (2018-01-31)
1419
* BACKWARDS-INCOMPATIBLE: Drop support for Django < 1.11
1520
* DJANGO: Support Django 2.0

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers =
2727
[options]
2828
packages = find:
2929
install_requires =
30-
apns2>=0.3.0
30+
apns2>=0.3.0,<0.6.0
3131
pywebpush>=1.3.0
3232
Django>=1.11
3333

tox.ini

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist =
33
py27-django111
44
py37-django{111,20,22}
5-
flake8
5+
py37-flake8
66

77
[testenv]
88
setenv =
@@ -18,10 +18,9 @@ deps =
1818
django111: Django>=1.11,<2.0
1919
django20: Django>=2.0,<2.1
2020
django22: Django>=2.2
21-
apns2>=0.3.0
2221

23-
[testenv:flake8]
24-
commands = flake8
22+
[testenv:py37-flake8]
23+
commands = flake8 --exit-zero
2524
deps =
2625
flake8==3.5.0
2726
flake8-isort

0 commit comments

Comments
 (0)