Merge pull request #191 from mplanchard/v1.2.1release

Prep for v1.2.1 release

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-1.2.1 (2017-11-05)
+1.2.1 (2017-11-29)
 ------------------
 
 - Matrix-based authorization, allowing users to have multiple actions
@@ -22,7 +22,8 @@ Changelog
 
 - Travis CI testing for Python 3.6 and pypy3 (#183)
 
-- Several documentation improvements (thanks @tescalada, #166, #161, #172)
+- Several documentation improvements (thanks @tescalada, #166, #161, #172 and
+  @axnsan12, #190)
 
 1.2.0 (2016-06-25)
 ------------------

README.rst

@@ -10,8 +10,8 @@ pypiserver - minimal PyPI server for use with pip/easy_install
 |pypi-ver| |travis-status| |dependencies| |downloads-count| |python-ver| \
 |proj-license|
 
-:Version:     1.2.1rc0
-:Date:        2017-11-14 11:49:30
+:Version:     1.2.1
+:Date:        2017-11-29 11:49:30
 :Source:      https://github.com/pypiserver/pypiserver
 :PyPI:        https://pypi.python.org/pypi/pypiserver
 :Travis:      https://travis-ci.org/pypiserver/pypiserver

pypiserver/__init__.py

@@ -1,9 +1,9 @@
 import re as _re
 import sys
 
-version = __version__ = "1.2.1rc0"
+version = __version__ = "1.2.1"
 __version_info__ = tuple(_re.split('[.-]', __version__))
-__updated__ = "2017-11-14 11:49:30"
+__updated__ = "2017-11-29 18:47:30"
 
 __title__ = "pypiserver"
 __summary__ = "A minimal PyPI server for use with pip/easy_install."

requirements/dev.pip

@@ -11,7 +11,8 @@ setuptools-git>=0.3
 passlib>=1.6
 tox
 wheel>=0.25.0
-pytest>=2.3
+pytest>=2.3;        python_version != '3.3'
+pytest>=2.3,<3.3;   python_version == '3.3'
 webtest;        python_version != '2.5'
 mock;           python_version <= '3.2'
 gevent>=1.1b4;  python_version >= '3'