summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Parise <jon@pinterest.com>2019-08-20 09:43:13 -0700
committerJon Parise <jon@pinterest.com>2019-08-20 09:43:13 -0700
commitf6ca790148cacb9b1144248d531adeffac0f7d3c (patch)
tree02156cc9ddc2ebd9f6117010525db1528b757824
parent782d3ea20e671325a2125f17a3bdaf20ee3d3a7a (diff)
downloadpymemcache-f6ca790148cacb9b1144248d531adeffac0f7d3c.tar.gz
Inaugurate pymemcache 3.0 development
-rw-r--r--ChangeLog.rst12
-rw-r--r--docs/conf.py4
-rw-r--r--pymemcache/__init__.py2
3 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index f3904b7..321e51c 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,12 @@
Changelog
=========
+New in version 3.0.0 (unreleased)
+---------------------------------
+
+* Validate integer inputs for ``expire``, ``delay``, ``incr``, ``decr``, and
+ ``memlimit`` -- non-integer values now raise ``MemcacheIllegalInputError``
+
New in version 2.2.2
--------------------
* Fix ``long_description`` string in Python packaging.
@@ -9,12 +15,6 @@ New in version 2.2.1
--------------------
* Fix ``flags`` when setting multiple differently-typed values at once.
-New in version 3.0.0 (unreleased)
----------------------------------
-
-* Validate integer inputs for ``expire``, ``delay``, ``incr``, ``decr``, and
- ``memlimit`` -- non-integer values now cause ``MemcacheIllegalInputError``s
-
New in version 2.2.0
--------------------
* Drop official support for Python 3.4.
diff --git a/docs/conf.py b/docs/conf.py
index a614c6b..b2a0c47 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -64,9 +64,9 @@ author = u'Charles Gordon, Nicholas Charriere, Jon Parise, Joe Gordon'
# built documents.
#
# The short X.Y version.
-version = u'2.2'
+version = u'3.0'
# The full version, including alpha/beta/rc tags.
-release = u'2.2.2'
+release = u'3.0.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py
index 33e1cb1..a863dcb 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.2.2'
+__version__ = '3.0.0-dev'
from pymemcache.client.base import Client # noqa
from pymemcache.client.base import PooledClient # noqa