From 0c4c27fa5c7f8a47194997267f0b6b5829826abf Mon Sep 17 00:00:00 2001
From: Kostis Anagnostopoulos <ankostis@gmail.com>
Date: Wed, 20 Jan 2016 19:50:34 +0100
Subject: [PATCH] v1.2.0.dev1 (<--1.1.10): Stop supporting py<2.7 & py<3.3
 (#107).

---
 .travis.yml            |  2 --
 CHANGES.rst            |  7 +++++++
 README.rst             | 17 +++++++++--------
 pypiserver/__init__.py |  4 ++--
 pypiserver/_app.py     | 11 +++++------
 setup.py               |  3 ---
 tests/test_main.py     |  2 +-
 tox.ini                |  2 +-
 8 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 96b5cbe..69753c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,6 @@ sudo: false
 language: python
 python: 2.7
 env:
-  - TOX_ENV=py25
-  - TOX_ENV=py26
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
diff --git a/CHANGES.rst b/CHANGES.rst
index 06f0f9b..01bd7d3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.2.0 (2016-XX-XX)
+------------------
+"New Day"
+
+- Stop supporting `python-2 < 2.7` and `python-3 < 3.3`.
+
+
 1.1.10 (2016-01-19)
 ------------------
 Serve 1000s of packages, PGP-Sigs, skip versions starting with 'v'.
diff --git a/README.rst b/README.rst
index 788f1e5..c1ae638 100644
--- a/README.rst
+++ b/README.rst
@@ -6,8 +6,8 @@ pypiserver - minimal PyPI server for use with pip/easy_install
 |pypi-ver| |travis-status| |dependencies| |downloads-count| |python-ver| \
 |proj-license|
 
-:Version:     1.1.10
-:Date:        2016-01-18
+:Version:     1.2.0.dev1
+:Date:        2016-XX-XX
 :Source:      https://github.com/pypiserver/pypiserver
 :PyPI:        https://pypi.python.org/pypi/pypiserver
 :Travis:      https://travis-ci.org/pypiserver/pypiserver
@@ -18,23 +18,24 @@ pypiserver - minimal PyPI server for use with pip/easy_install
   :backlinks: top
 
 
-*pypiserver* is a minimal PyPI_ compatible server.
-It can be used to upload and serve packages, wheels and eggs
-to *pip* or *easy_install*.
+*pypiserver* is a minimal PyPI_ compatible server based on bottle_.
+It can be used to upload and serve packages, wheels, eggs and PGP-signatures
+with *pip* or *easy_install*.
 The packages are stored in regular directories.
 
 
 
 Quickstart: Installation and Usage
 ==================================
-*pypiserver* will work with python 2.5 --> 2.7 and 3.2 --> 3.4.
-Python 3.0 and 3.1 may also work, but pypiserver is not being tested
+*pypiserver* `> 1.2.x` works with python `2.7` and `3.3 --> 3.5` or *pypy*.
+Python `3.0 --> 3.2` may also work, but it is not being tested
 with these versions.
+For older python-2 version, use version `1.1.x` series.
 
 Run the following commands to get your PyPI server up and running::
 
   ## Installation.
-  pip install pypiserver[passlib]
+  pip install pypiserver                ## or : pypiserver[passlib,watchdog]
   mkdir ~/packages                      ## Copy packages into this directory.
 
   ## Start server.
diff --git a/pypiserver/__init__.py b/pypiserver/__init__.py
index 304bff6..350bee0 100644
--- a/pypiserver/__init__.py
+++ b/pypiserver/__init__.py
@@ -1,8 +1,8 @@
 import re as _re
 
-version = __version__ = "1.1.10"
+version = __version__ = "1.2.0.dev1"
 __version_info__ = tuple(_re.split('[.-]', __version__))
-__updated__ = "2016-01-19"
+__updated__ = "2016-XX-XX"
 
 __title__ = "pypiserver"
 __summary__ = "A minimal PyPI server for use with pip/easy_install."
diff --git a/pypiserver/_app.py b/pypiserver/_app.py
index 594549e..775bf15 100644
--- a/pypiserver/_app.py
+++ b/pypiserver/_app.py
@@ -56,12 +56,11 @@ def log_request():
 
 @app.hook('after_request')
 def log_response():
-    log.info(config.log_res_frmt,  # vars(response))  ## DOES NOT WORK!
-             dict(
-                 response=response,
-                 status=response.status, headers=response.headers,
-                 body=response.body, cookies=response._cookies,
-             ))
+    log.info(config.log_res_frmt, {  # vars(response))  ## DOES NOT WORK!
+        'response': response,
+        'status': response.status, 'headers': response.headers,
+        'body': response.body, 'cookies': response._cookies,
+    })
 
 
 @app.error
diff --git a/setup.py b/setup.py
index e17f715..5582feb 100644
--- a/setup.py
+++ b/setup.py
@@ -55,11 +55,8 @@ setup(name="pypiserver",
           "Operating System :: POSIX",
           "Operating System :: OS Independent",
           "Programming Language :: Python :: 2",
-          "Programming Language :: Python :: 2.5",
-          "Programming Language :: Python :: 2.6",
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
-          "Programming Language :: Python :: 3.2",
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
diff --git a/tests/test_main.py b/tests/test_main.py
index 2c4896c..e9ed4bf 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -47,7 +47,7 @@ def test_default_pkgdir(main):
 
 
 def test_noargs(main):
-    assert main([]) == dict(host="0.0.0.0", port=8080, server="auto")
+    assert main([]) == {'host': "0.0.0.0", 'port': 8080, 'server': "auto"}
 
 
 def test_port(main):
diff --git a/tox.ini b/tox.ini
index 211dfb3..3a99d7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,py33,py34
+envlist = py27,py33,py34
 
 [testenv]
 deps=-r{toxinidir}/requirements/dev.pip