v1.2.0.dev1 (<--1.1.10): Stop supporting py<2.7 & py<3.3 (pypiserver#107

).
ankostis · Jan 20, 2016 · 4bdab1a · 4bdab1a
1 parent cee2481
commit 4bdab1a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git 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
@@ -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
@@ -6,7 +6,7 @@ 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
+:Version:     1.2.0.dev1
 :Date:        2016-01-18
 :Source:      https://github.com/pypiserver/pypiserver
 :PyPI:        https://pypi.python.org/pypi/pypiserver
@@ -27,9 +27,10 @@ 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::
 

diff --git 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
@@ -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
@@ -55,12 +55,8 @@ def get_version():
           "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",
           "Topic :: Software Development :: Build Tools",

diff --git 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
@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,py33,py34
+envlist = py27,py33,py34
 
 [testenv]
 deps=-r{toxinidir}/requirements/dev.pip