Merge pull request twisted#67 from twisted/release-15.0.0

Release 15.0.0
pawelmhm · Jan 11, 2015 · aa2b367 · aa2b367
2 parents 64abb47 + f9df19e
commit aa2b367
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 This is the MIT license.
 
-Copyright (c) 2014, Klein Contributors (see AUTHORS)
+Copyright (c) 2011-2015, Klein Contributors (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/NEWS.rst b/NEWS.rst
@@ -1,6 +1,10 @@
 NEWS
 ====
 
+15.0.0 - 2015-01-11
+-------------------
+ * [BUG] Klein now includes its test package as part of the distribution. [`#65 <https://github.com/twisted/klein/pull/65>`_]
+
 14.0.0 - 2014-12-18
 -------------------
  * [BUG] Klein now attempts to decode non-ASCII URLs as UTF-8 and serves a 400 if that fails instead of always serving a 500. [`#62 <https://github.com/twisted/klein/pull/62>`_]

diff --git a/klein/__init__.py b/klein/__init__.py
@@ -1,7 +1,7 @@
 from klein.app import Klein, run, route, resource
 
 
-__version__ = "14.0.0"
+__version__ = "15.0.0"
 
 __author__  = "The Klein contributors (see AUTHORS)"
 __license__ = "MIT"

diff --git a/setup.py b/setup.py
@@ -55,6 +55,6 @@ def find_version(*file_paths):
         packages=["klein", "klein.test"],
         url="https://github.com/twisted/klein",
         version=find_version('klein', '__init__.py'),
-        maintainer='David Reid',
-        maintainer_email='[email protected]',
+        maintainer='HawkOwl',
+        maintainer_email='[email protected]',
     )