Merge pull request #75 from ankostis/prep_v1.1.7

(2) Preparations for v1.1.7: beta.0

.travis.yml

@@ -5,6 +5,7 @@ env:
   - TOX_ENV=py27
   - TOX_ENV=py32
   - TOX_ENV=py33
+  - TOX_ENV=py34
   - TOX_ENV=pypy
 
 install:

README.rst

@@ -479,11 +479,16 @@ proxypypi (https://pypi.python.org/pypi/proxypypi)
 Changelog
 =========
 
-1.1.7 (2015-01-10)
+1.1.7 (2015-02-23)
 ------------------
-- support password protected package listings and downloads,
+- #65, #66: Improve Auth for private repos by supporting i
+  password protected package listings and downloads,
   in addition to uploads (use the -a, --authenticate option
   to specify which to protect).
+- #67: Add cache-control http-header, reqed by pip.
+- #56, #70: Ignore non-packages when serving.
+- #58, #62: Log all http-requests.
+- #61: Possible to change welcome-msg.
 
 1.1.6 (2014-03-05)
 ------------------

pypiserver/__init__.py

@@ -1,11 +1,11 @@
-__version_info__ = (1, 1, 6)
-version = __version__ = "1.1.6"
+__version_info__ = (1, 1, 7, 'beta.0')
+version = __version__ = "1.1.7-beta.0"
 
 
 def app(root=None,
         redirect_to_fallback=True,
         fallback_url=None,
-        authenticated=[],
+        authenticated=None,
         password_file=None,
         overwrite=False,
         log_req_frmt="%(bottle.request)s", 
@@ -29,7 +29,7 @@ def app(root=None,
         fallback_url = "http://pypi.python.org/simple"
 
     _app.configure(root=root, redirect_to_fallback=redirect_to_fallback, fallback_url=fallback_url,
-                   authenticated=authenticated, password_file=password_file, overwrite=overwrite, 
+                   authenticated=authenticated or [], password_file=password_file, overwrite=overwrite, 
                    log_req_frmt=log_req_frmt, log_res_frmt=log_res_frmt, log_err_frmt=log_err_frmt,
                    welcome_file=welcome_file,
                    cache_control=cache_control,

pypiserver/_app.py

@@ -64,7 +64,7 @@ class auth(object):
 def configure(root=None,
               redirect_to_fallback=True,
               fallback_url=None,
-              authenticated=[],
+              authenticated=None,
               password_file=None,
               overwrite=False,
               log_req_frmt=None, 
@@ -87,7 +87,7 @@ def configure(root=None,
               log_err_frmt=log_err_frmt,
               cache_control=cache_control))
 
-    config.authenticated = authenticated
+    config.authenticated = authenticated or []
 
     if root is None:
         root = os.path.expanduser("~/packages")

setup.py

@@ -52,6 +52,7 @@ setup(name="pypiserver",
         "Programming Language :: Python :: 3.1",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Topic :: Software Development :: Build Tools",
         "Topic :: System :: Software Distribution"],
       zip_safe=False,