diff options
| author | Nicholas Charriere <nicholascharriere@gmail.com> | 2016-08-01 13:24:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 13:24:25 -0700 |
| commit | 371e673cf733caa2f42ee10173ac51770a6aa9b2 (patch) | |
| tree | 18ee328165493676c7ebdb68ada7a4c11f7898c0 | |
| parent | 9a2cfaed89a020e7e750c5f3b4b952d97061cfa8 (diff) | |
| parent | 9c00e1ea860a25f28ee4d8e69e9d024a1f01cf7e (diff) | |
| download | pymemcache-371e673cf733caa2f42ee10173ac51770a6aa9b2.tar.gz | |
Merge pull request #106 from pinterest/release
Release 1.3.6 to pypi
| -rw-r--r-- | ChangeLog.rst | 5 | ||||
| -rw-r--r-- | pymemcache/__init__.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 35 |
3 files changed, 27 insertions, 15 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst index a315f9d..d22bc68 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,5 +1,10 @@ Change Log ========== +New in version 1.3.6 +-------------------- +* Fix flake8 and cleanup tox building +* Fix security vulnerability by sanitizing key input + New in version 1.3.5 -------------------- * Bug fix for HashClient when retries is set to zero. diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py index 9263605..e2f0c4e 100644 --- a/pymemcache/__init__.py +++ b/pymemcache/__init__.py @@ -1,2 +1,2 @@ -__version__ = '1.3.5' +__version__ = '1.3.6' __author__ = "Charles Gordon" @@ -1,22 +1,29 @@ +[bumpversion] +current_version = 1.3.6 +commit = False +tag = True + [bdist_wheel] universal = true [pytest] norecursedirs = build docs/_build *.egg .tox *.venv -addopts = - --verbose - --tb=short - --capture=no - # show extra test summary info as specified by chars (f)ailed, (E)error, - # (s)skipped, (x)failed, (X)passed. - -rfEsxX - --cov=pymemcache --cov-report=xml --cov-report=term-missing - -m unit - -markers = - unit - integration - benchmark +addopts = + --verbose + --tb=short + --capture=no + # show extra test summary info as specified by chars (f)ailed, (E)error, + # (s)skipped, (x)failed, (X)passed. + -rfEsxX + --cov=pymemcache --cov-report=xml --cov-report=term-missing + -m unit +markers = + unit + integration + benchmark [flake8] show-source = True + +[bumpversion:file:pymemcache/__init__.py] + |