merge with changes from 1.0.1 release

README.rst

@@ -6,8 +6,8 @@ pypiserver - minimal PyPI server for use with pip/easy_install
 
 
 :Authors: Ralf Schmitt <ralf@systemexit.de>
-:Version: 1.0.0
-:Date:    2012-10-26
+:Version: 1.0.1
+:Date:    2013-01-03
 :Download: http://pypi.python.org/pypi/pypiserver#downloads
 :Code: https://github.com/schmir/pypiserver
 
@@ -368,7 +368,7 @@ License
 pypiserver contains a copy of bottle_ which is available under the
 MIT license::
 
-  Copyright (c) 2010, Marcel Hellkamp.
+  Copyright (c) 2012, Marcel Hellkamp.
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -391,7 +391,7 @@ MIT license::
 
 The remaining part is distributed under the zlib/libpng license::
 
-  Copyright (c) 2011 Ralf Schmitt
+  Copyright (c) 2011-2013 Ralf Schmitt
 
   This software is provided 'as-is', without any express or implied
   warranty. In no event will the authors be held liable for any damages
@@ -443,6 +443,17 @@ EggBasket (http://pypi.python.org/pypi/EggBasket)
 
 Changelog
 =========
+1.0.1 (2013-01-03)
+------------------
+- make 'pypi-server -Ux' work on windows
+  ('module' object has no attribute 'spawnlp',
+  https://github.com/schmir/pypiserver/issues/26)
+- use absolute paths in hrefs for root view
+  (https://github.com/schmir/pypiserver/issues/25)
+- add description of uploads to the documentation
+- make the test suite work on python 3
+- make pypi-server-standalone work with python 2.5
+
 1.0.0 (2012-10-26)
 ------------------
 - add passlib and waitress to pypi-server-standalone

pypi-server-in.py

@@ -59,5 +59,8 @@ sys.meta_path.append(importer)
 
 if __name__ == "__main__":
     from pypiserver import core
-    core.DEFAULT_SERVER = "waitress"
+    if sys.version_info >= (2, 6):
+        core.DEFAULT_SERVER = "waitress"
+    else:
+        core.bottle.AutoServer.adapters.remove(core.bottle.WaitressServer)
     core.main()

pypiserver/__init__.py

@@ -1,5 +1,5 @@
-__version_info__ = (1, 0, 0)
-version = __version__ = "1.0.0"
+__version_info__ = (1, 0, 1)
+version = __version__ = "1.0.1"
 
 
 def app(root=None,