summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Parise <jon@pinterest.com>2019-08-06 12:06:21 -0700
committerGitHub <noreply@github.com>2019-08-06 12:06:21 -0700
commit762856daf858360e4bd848fd82040f266bfdb2e2 (patch)
tree98d90106593e1887b702ce66caa877e6423e4198
parent7ad74da1c242a735bd805c836f3ddf5830b19a83 (diff)
downloadpymemcache-762856daf858360e4bd848fd82040f266bfdb2e2.tar.gz
Fix long_description string in Python packaging (#249)v2.2.2
When defining `long_description` in setup.cfg using the `file:` directive, we need to keep everything on one line. Otherwise, it will treat the value as a block of literal text.
-rw-r--r--ChangeLog.rst12
-rw-r--r--MANIFEST.in1
-rw-r--r--docs/conf.py2
-rw-r--r--pymemcache/__init__.py2
-rw-r--r--setup.cfg3
5 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index c8d6376..1f5a766 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,5 +1,9 @@
-Change Log
-==========
+Changelog
+=========
+
+New in version 2.2.2
+--------------------
+* Fix ``long_description`` string in Python packaging.
New in version 2.2.1
--------------------
@@ -72,8 +76,8 @@ New in version 1.4.1
New in version 1.4.0
--------------------
-* 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!
+* 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
New in version 1.3.8
diff --git a/MANIFEST.in b/MANIFEST.in
index a82c813..f8469b7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include README.* ChangeLog.* setup.py setup.cfg LICENSE.txt
recursive-include pymemcache *.py
global-exclude *.pyc
global-exclude *.pyo
-
diff --git a/docs/conf.py b/docs/conf.py
index e925efd..a614c6b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@ author = u'Charles Gordon, Nicholas Charriere, Jon Parise, Joe Gordon'
# The short X.Y version.
version = u'2.2'
# The full version, including alpha/beta/rc tags.
-release = u'2.2.0'
+release = u'2.2.2'
# 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 ae051ba..33e1cb1 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.2.1'
+__version__ = '2.2.2'
from pymemcache.client.base import Client # noqa
from pymemcache.client.base import PooledClient # noqa
diff --git a/setup.cfg b/setup.cfg
index 867747e..a0b4e70 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,8 +4,7 @@ version = attr: pymemcache.__version__
author = Charles Gordon
author_email = charles@pinterest.com
description = "A comprehensive, fast, pure Python memcached client"
-long_description =
- file: README.rst, ChangeLog.rst
+long_description = file: README.rst, ChangeLog.rst
long_description_content_type = text/x-rst
license = Apache License 2.0
url = https://github.com/pinterest/pymemcache