summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Gordon <charles.gordon@gmail.com>2015-07-16 13:35:19 -0700
committerCharles Gordon <charles.gordon@gmail.com>2015-07-16 13:35:19 -0700
commit3444e0e9d19f3a2426c90da0e695dac8f0faa518 (patch)
tree107f58dcb6122ee10133b621adcc4ca70ed7c3ce
parent21a37805126b1f37823910172222f429e2a8b5e8 (diff)
parentbe893ce106fa2b0bce527d0cb1e8ba2a470dc483 (diff)
downloadpymemcache-3444e0e9d19f3a2426c90da0e695dac8f0faa518.tar.gz
Merge pull request #63 from sontek/introduce_changelog
Introduce ChangeLog
-rw-r--r--ChangeLog.rst6
-rw-r--r--MANIFEST.in2
-rw-r--r--setup.py9
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
new file mode 100644
index 0000000..8900aa8
--- /dev/null
+++ b/ChangeLog.rst
@@ -0,0 +1,6 @@
+Change Log
+==========
+New in version 1.2.9
+--------------------
+
+* Introduced PooledClient a thread-safe pool of clients
diff --git a/MANIFEST.in b/MANIFEST.in
index 0bad4fb..a82c813 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README.* setup.py setup.cfg LICENSE.txt
+include README.* ChangeLog.* setup.py setup.cfg LICENSE.txt
recursive-include pymemcache *.py
global-exclude *.pyc
global-exclude *.pyo
diff --git a/setup.py b/setup.py
index b1f2404..bfc12be 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,16 @@
#!/usr/bin/env python
+import os
from setuptools import setup, find_packages
from pymemcache import __version__
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+readme = read('README.md')
+changelog = read('ChangeLog.rst')
+
setup(
name='pymemcache',
version=__version__,
@@ -12,7 +19,7 @@ setup(
packages=find_packages(),
install_requires=['six'],
description='A comprehensive, fast, pure Python memcached client',
- long_description=open('README.md').read(),
+ long_description=readme + '\n' + changelog,
license='Apache License 2.0',
url='https://github.com/Pinterest/pymemcache',
classifiers=[