summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.clog.toml13
-rw-r--r--.travis.yml108
-rw-r--r--CHANGES.md10
-rw-r--r--MANIFEST.in6
-rwxr-xr-xensure-zookeeper-env.sh2
-rw-r--r--kazoo/version.py2
-rw-r--r--setup.cfg5
7 files changed, 86 insertions, 60 deletions
diff --git a/.clog.toml b/.clog.toml
new file mode 100644
index 0000000..e39c780
--- /dev/null
+++ b/.clog.toml
@@ -0,0 +1,13 @@
+[clog]
+repository = "https://github.com/python-zk/kazoo"
+changelog = "CHANGES.md"
+from-latest-tag = true
+link-style = "github"
+
+[sections]
+Refactor = ["refactor"]
+Test = ["test"]
+Doc = ["docs"]
+Chore = ["chore"]
+Features = ["feat", "feature"]
+"Bug Fixes" = ["fix", "bug"]
diff --git a/.travis.yml b/.travis.yml
index cc5b51f..0c105d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,66 +1,70 @@
sudo: false
-
addons:
apt:
packages:
- libevent-dev
-
cache:
directories:
- - $HOME/.cache/pip
- - zookeeper
-
+ - "$HOME/.cache/pip"
+ - zookeeper
language: python
python:
- - "2.7"
+- '2.7'
matrix:
- exclude:
- - python: "2.7"
- include:
- - python: "2.6"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
- - python: "2.6"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
- - python: "2.6"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
- - python: "2.6"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent
- - python: "2.6"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
- - python: "2.6"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-eventlet
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-eventlet
- - python: "2.7"
- env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27
- - python: "3.3"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
- - python: "3.3"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py33
- - python: "3.4"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py34
- - python: "3.4"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py34
- - python: "pypy"
- env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=pypy
- - python: "pypy"
- env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=pypy
-
+ exclude:
+ - python: '2.7'
+ include:
+ - python: '2.6'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
+ - python: '2.6'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26
+ - python: '2.6'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
+ - python: '2.6'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-gevent
+ - python: '2.6'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
+ - python: '2.6'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-eventlet
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27-gevent
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27-eventlet
+ - python: '2.7'
+ env: ZOOKEEPER_VERSION=3.5.2-alpha TOX_VENV=py27
+ - python: '3.3'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
+ - python: '3.3'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py33
+ - python: '3.4'
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py34
+ - python: '3.4'
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py34
+ - python: pypy
+ env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=pypy
+ - python: pypy
+ env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=pypy
notifications:
email: false
-
install:
- - pip install tox
-
+- pip install tox
script:
- - make test
+- make test
+deploy:
+ provider: pypi
+ user: bbangert
+ password:
+ secure: L9yXZ2PhQ2wJKQkgigIzW3f/a3ajzUamMdThVelcp/NZeTJfzlC/t89lfSRwLh95o9Z/aIxC4T8yZvNrRzzyMEP0O6s1F69pVm5Px+KBuv82lmI7p5sKTYPp35CE9jH+K/52Fy0+Az5F502xLrkaO4VLLA+zhLffw/qyvNbZui0=
+ on:
+ tags: true
+ python: 3.4
+ distributions: release
+ skip_upload_docs: true
diff --git a/CHANGES.md b/CHANGES.md
index 52f9975..2dc4cdf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
-Changelog
-=========
+<a name="2.3.1"></a>
+## 2.3.1 (2017-06-01)
+
+
+#### Chore
+
+* update MANIFEST.in to reflect changes to filenames ([c9a38c5d](https://github.com/python-zk/kazoo/commit/c9a38c5d650d6d92ff30fd3c1c792fc71db9ce02))
+* add travis deployment and update ZK versions ([7d5d59cb](https://github.com/python-zk/kazoo/commit/7d5d59cb049244b89625d621c9d91d9a44c4b051), closes [#436](https://github.com/python-zk/kazoo/issues/436))
2.3.0 (2017-05-31)
------------------
diff --git a/MANIFEST.in b/MANIFEST.in
index fada1fb..92318b1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
-include CHANGES.rst
-include CONTRIBUTING.rst
-include README.rst
+include CHANGES.md
+include CONTRIBUTING.md
+include README.md
include LICENSE
include MANIFEST.in
exclude .gitignore
diff --git a/ensure-zookeeper-env.sh b/ensure-zookeeper-env.sh
index 3e53a74..c75c90f 100755
--- a/ensure-zookeeper-env.sh
+++ b/ensure-zookeeper-env.sh
@@ -4,7 +4,7 @@ set -e
HERE=`pwd`
ZOO_BASE_DIR="$HERE/zookeeper"
-ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.6}
+ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.10}
ZOOKEEPER_PATH="$ZOO_BASE_DIR/$ZOOKEEPER_VERSION"
ZOO_MIRROR_URL="http://archive.apache.org/dist"
diff --git a/kazoo/version.py b/kazoo/version.py
index 8219039..1c4ddd3 100644
--- a/kazoo/version.py
+++ b/kazoo/version.py
@@ -1 +1 @@
-__version__ = '2.3.0'
+__version__ = '2.3.1'
diff --git a/setup.cfg b/setup.cfg
index 4be1c2a..9471c60 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,7 @@
+[aliases]
+clean_egg_info = egg_info -RDb ''
+release = clean_egg_info sdist bdist_wheel
+
[bdist_wheel]
universal = 1
@@ -12,4 +16,3 @@ nocapture = 1
cover-erase = 1
where = kazoo
cover-inclusive = 1
-
View Lorry Controller Status