Skip to content

Commit dabffdf

Browse files
authored
Merge pull request #439 from python-zk/feat/issue-436
chore: add travis deployment and update ZK versions
2 parents 2c0374a + 7d5d59c commit dabffdf

File tree

3 files changed

+61
-54
lines changed

3 files changed

+61
-54
lines changed

.travis.yml

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,70 @@
11
sudo: false
2-
32
addons:
43
apt:
54
packages:
65
- libevent-dev
7-
86
cache:
97
directories:
10-
- $HOME/.cache/pip
11-
- zookeeper
12-
8+
- "$HOME/.cache/pip"
9+
- zookeeper
1310
language: python
1411
python:
15-
- "2.7"
12+
- '2.7'
1613
matrix:
17-
exclude:
18-
- python: "2.7"
19-
include:
20-
- python: "2.6"
21-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
22-
- python: "2.6"
23-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
24-
- python: "2.6"
25-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
26-
- python: "2.6"
27-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent
28-
- python: "2.6"
29-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
30-
- python: "2.6"
31-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-eventlet
32-
- python: "2.7"
33-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
34-
- python: "2.7"
35-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
36-
- python: "2.7"
37-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
38-
- python: "2.7"
39-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent
40-
- python: "2.7"
41-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
42-
- python: "2.7"
43-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-eventlet
44-
- python: "2.7"
45-
env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27
46-
- python: "3.3"
47-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
48-
- python: "3.3"
49-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py33
50-
- python: "3.4"
51-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py34
52-
- python: "3.4"
53-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py34
54-
- python: "pypy"
55-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=pypy
56-
- python: "pypy"
57-
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=pypy
58-
14+
exclude:
15+
- python: '2.7'
16+
include:
17+
- python: '2.6'
18+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
19+
- python: '2.6'
20+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26
21+
- python: '2.6'
22+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
23+
- python: '2.6'
24+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-gevent
25+
- python: '2.6'
26+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
27+
- python: '2.6'
28+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-eventlet
29+
- python: '2.7'
30+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
31+
- python: '2.7'
32+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27
33+
- python: '2.7'
34+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
35+
- python: '2.7'
36+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27-gevent
37+
- python: '2.7'
38+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
39+
- python: '2.7'
40+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27-eventlet
41+
- python: '2.7'
42+
env: ZOOKEEPER_VERSION=3.5.2-alpha TOX_VENV=py27
43+
- python: '3.3'
44+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
45+
- python: '3.3'
46+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py33
47+
- python: '3.4'
48+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py34
49+
- python: '3.4'
50+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py34
51+
- python: pypy
52+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=pypy
53+
- python: pypy
54+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=pypy
5955
notifications:
6056
email: false
61-
6257
install:
63-
- pip install tox
64-
58+
- pip install tox
6559
script:
66-
- make test
60+
- make test
61+
deploy:
62+
provider: pypi
63+
user: bbangert
64+
password:
65+
secure: L9yXZ2PhQ2wJKQkgigIzW3f/a3ajzUamMdThVelcp/NZeTJfzlC/t89lfSRwLh95o9Z/aIxC4T8yZvNrRzzyMEP0O6s1F69pVm5Px+KBuv82lmI7p5sKTYPp35CE9jH+K/52Fy0+Az5F502xLrkaO4VLLA+zhLffw/qyvNbZui0=
66+
on:
67+
tags: true
68+
python: 3.4
69+
distributions: release
70+
skip_upload_docs: true

ensure-zookeeper-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
HERE=`pwd`
66
ZOO_BASE_DIR="$HERE/zookeeper"
7-
ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.6}
7+
ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.10}
88
ZOOKEEPER_PATH="$ZOO_BASE_DIR/$ZOOKEEPER_VERSION"
99
ZOO_MIRROR_URL="http://archive.apache.org/dist"
1010

setup.cfg

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
[aliases]
2+
clean_egg_info = egg_info -RDb ''
3+
release = clean_egg_info sdist bdist_wheel
4+
15
[bdist_wheel]
26
universal = 1
37

@@ -12,4 +16,3 @@ nocapture = 1
1216
cover-erase = 1
1317
where = kazoo
1418
cover-inclusive = 1
15-

0 commit comments

Comments
 (0)