Merge pull request #214 from onefinestay/release-notes-and-version

Release notes, version bump and license typo fix
nameko · Mar 11, 2015 · 766d7f4 · 766d7f4
2 parents 24fde3a + 62c6edb
commit 766d7f4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/CHANGES b/CHANGES
@@ -6,9 +6,17 @@ are in form of *headline.major.minor* numbers. Backwards-compatible changes
 increment the minor version number only.
 
 
-Unreleased
-----------
+Version 2.0.0
+-------------
 
+* Added HTTP entrypoints and experimental websocket support (contributed by
+  Armin Ronacher)
+* Added CLI and console script
+* Introduction of nameko "extensions" and nomenclature clarification
+* Removal of ``DependencyFactory`` in favour of prototype pattern
+* Complete documentation rewrite
+* Spun out ``nameko.contrib.sqlalchemy`` into `nameko-sqlalchemy <https://pypi.python.org/pypi/nameko-sqlalchemy>`_ as a **community extension**.
+* Spun out ``nameko.legacy`` package into `nameko-nova-compat <https://pypi.python.org/pypi/nameko-nova-compat>`_
 * Rename the standalone rpc proxy to
   :class:`~nameko.standalone.rpc.ServiceRpcProxy` and add a
   :class:`~nameko.standalone.rpc.ClusterRpcProxy`, using a single reply queue

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013 Lifealike, Ltd. DBA onefinestay
+Copyright 2015 Lifealike, Ltd. DBA onefinestay
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/docs/license.rst b/docs/license.rst
@@ -1,15 +1,4 @@
 License
 =======
 
-Copywrite 2015 Lifealike Ltd. DBA onefinestay
-
-Nameko is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Nameko is licensed under the Apache License, Version 2.0. Please see LICENSE in the project root for details.
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1 +1,6 @@
+.. spelling::
+
+    Armin
+    Ronacher
+
 .. include:: ../CHANGES
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -21,7 +21,6 @@ conftest
 contextdata
 contextmanager
 contrib
-copywrite
 ctx
 debian
 deployable

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='nameko',
-    version='1.14.0',
+    version='2.0.0',
     description='A microservices framework for Python that lets service '
                 'developers concentrate on application logic and encourages '
                 'testability.',