diff options
| author | Nicholas Charriere <nicholascharriere@gmail.com> | 2016-10-03 16:13:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 16:13:10 -0700 |
| commit | ef8f9b3f42db238e1c4ce44164ff83003111acf4 (patch) | |
| tree | 9106b69ce0c2a18391c63e955985207648731865 | |
| parent | d1b827c95a401fe859f4d630b33548513a9ce7ba (diff) | |
| parent | b7c9e99fb0c47ae4b85c87f8fa7e346a0d0967da (diff) | |
| download | pymemcache-ef8f9b3f42db238e1c4ce44164ff83003111acf4.tar.gz | |
Merge pull request #119 from pinterest/pre-release-137
Pre release 137
| -rw-r--r-- | README.rst | 1 | ||||
| -rw-r--r-- | pymemcache/__init__.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 6 |
3 files changed, 5 insertions, 4 deletions
@@ -111,3 +111,4 @@ Credits * `Adam Chainz <http://github.com/adamchainz>`_ * `Ernest W. Durbin III <https://github.com/ewdurbin>`_ * `Remco van Oosterhout <https://github.com/Vhab>`_ +* `Nicholas Charriere <https://github.com/nichochar>`_ diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py index e2f0c4e..b1ea50b 100644 --- a/pymemcache/__init__.py +++ b/pymemcache/__init__.py @@ -1,2 +1,2 @@ -__version__ = '1.3.6' +__version__ = '1.3.7' __author__ = "Charles Gordon" @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.3.6 +current_version = 1.3.7 commit = False tag = True @@ -8,7 +8,7 @@ universal = true [tool:pytest] norecursedirs = build docs/_build *.egg .tox *.venv -addopts = +addopts = --verbose --tb=short --capture=no @@ -17,7 +17,7 @@ addopts = -rfEsxX --cov=pymemcache --cov-report=xml --cov-report=term-missing -m unit -markers = +markers = unit integration benchmark |