summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Charriere <nicholascharriere@gmail.com>2016-11-07 13:28:18 -0800
committerNicholas Charriere <nicholas@pinterest.com>2016-12-02 13:54:28 -0800
commit6f85787a90e25150afab355695e8e334baa58315 (patch)
treed382121deb7a659e1d16ba884c7fee42347bb8cf
parenteca78325da74e73611ad2d20dde67403252a0c5c (diff)
downloadpymemcache-drop-pypy3-travis-ci-support.tar.gz
Update ChangeLog.rstdrop-pypy3-travis-ci-support
-rw-r--r--.travis.yml4
-rw-r--r--ChangeLog.rst2
-rw-r--r--tox.ini2
3 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 799c999..d576d02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,9 @@ env:
- TOXENV=py33
- TOXENV=py34
- TOXENV=pypy
- - TOXENV=pypy3
+# - TOXENV=pypy3
+# Drop support until travis fixes python3 pypy interpreter path issue
+# https://github.com/travis-ci/travis-ci/issues/6304#ref-issue-177592739
install:
- travis_retry pip install tox
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 3375fb0..246889c 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -2,7 +2,7 @@ Change Log
==========
New in version 1.4.0
--------------------
-* Unicode keys support. It is now possible to pass the flag `allow_unicode_keys` when creating the clients
+* Unicode keys support. It is now possible to pass the flag `allow_unicode_keys` when creating the clients, thanks @jogo!
* Fixed a bug where PooledClient wasn't following `default_noreply` arg set on init, thanks @kols!
* Improved documentation
diff --git a/tox.ini b/tox.ini
index 42174ff..eb1d81a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26, py27, pypy, pypy3, py33, py34, py35, docs, py27-flake8, py35-flake8, integration
+envlist = py26, py27, pypy, py33, py34, py35, docs, py27-flake8, py35-flake8, integration
skip_missing_interpreters = True
[testenv]