Merge remote-tracking branch 'parent/master' into 1.59.2

Author: kkszysiu

.travis.yml

@@ -1,13 +1,15 @@
 language: python
 python:
-  - 2.6
   - 2.7
-  - 3.2
-  - 3.3
   - 3.4
+  - 3.5
+  - 3.6
   - pypy
 services:
   - memcached
 install: python setup.py install
-before_script: pip install nose
-script: nosetests
+before_script: pip install -r test-requirements.txt
+script:
+  - flake8
+  - nosetests
+  - python -c 'import memcache; memcache._doctest()'

ChangeLog

@@ -1,3 +1,48 @@
+Fri, 15 Dec 2018 09:02:05 -0700  Sean Reifschneider  <jafo00@gmail.com>
+
+   *  Added testing for Python 3.5 and 3.6 (PR from Tim Graham) #110, #131
+
+   *  Fixed typos in docstrings (PR from Romuald Brunet, reviewed by Tim
+      Graham) #105
+
+   *  Removing Python 2.6, 3.2, and 3.3 testing (PR from Tim Graham) #115, #116
+
+   *  Removing unnecessary parens in return statements (PR from Tim Graham)
+      #113
+
+   *  Remove unused _has_unicode/_str_cls vars (PR from Tim Graham) #111
+
+   *  Add flake8 testing and cleanups (PR from Tim Graham, cleanups from Sean
+      Reifschneider) #112
+
+   * Fixed storing non-ASCII values on Python 2 and binary values on Python 3
+     (PR from Nicolas Noé) #135
+
+   * Fixed touch(..., time=0) command (PR from Nicolas Noé) #137
+
+Fri, 27 May 2016 13:44:55 -0600  Sean Reifschneider  <jafo@tummy.com>
+
+   *  1.58 release.
+
+   *  Fixing a performance regression in v1.54 in Python 2, using cPickle again.
+      Patch by edmorley #86
+
+   *  Support for "stats slabs".
+      Patch by grg350 #93
+
+   *  get_stats encoding fix.
+      Patch by bartTC #91
+
+   *  Pin Six version to >= 1.4
+      Patch by pipermirriam #81
+
+   *  setup.py build process pulls version from memcached.py
+      Patch by dieselmachine #72
+
+   *  delete() and delete_multi() now default the "time" argument to None,
+      since the protocol doesn't allow a time in some implementations.
+      Patch by oremj #27
+
 Fri, 31 Jul 2015 11:38:25 -0600  Sean Reifschneider  <jafo@tummy.com>
 
    *  1.57 release.

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: python-memcached
-Version: 1.31
+Version: 1.59
 Summary: A Python memcached client library.
 Home-page: http://www.tummy.com/Community/software/python-memcached/
 Author: Sean Reifschneider

do_release

@@ -19,7 +19,6 @@ if [ -f /tmp/python-memcached-"$VERSION".tar.gz ]; then
 	exit 1
 fi
 
-sed -ri 's/^(\s*version=).*$/\1"'"$VERSION"'",/' setup.py
 sed -ri 's/^(\s*__version__\s*=\s*).*$/\1"'"$VERSION"'"/' memcache.py
 sed -ri 's/^(\sVersion:\s*).*$/\1"'"$VERSION"'"/' PKG-INFO
 
@@ -30,4 +29,5 @@ git push --tags
 cd /tmp
 release "$VERSION" python-memcached
 cd python-memcached-"$VERSION"
-python setup.py sdist bdist_wheel upload
+python setup.py sdist bdist_wheel
+twine upload -r pypitest dist/*"$VERSION"* && twine upload -r pypi dist/*"$VERSION"*