pyro5 plug

README.md

@@ -22,11 +22,12 @@ This license, including disclaimer, is available in the 'LICENSE' file.
 
 Pyro5
 -----
-Pyro4 is considered feature complete and is now in 'maintenance' mode.
-This means that only important bug fixes and security issues will be made to Pyro4.
+Pyro4 is considered feature complete and new development is frozen.
+Only very important bug fixes (such as security issues) will still be made to Pyro4.
 New development, improvements and new features will only be available in its successor
-Pyro5:  https://github.com/irmen/Pyro5
-New code should use Pyro5 if possible.
+Pyro5: https://pyro5.readthedocs.io New code should strongly consider using Pyro5 unless a feature
+of Pyro4 is strictly required.  Older code should consider migrating to Pyro5. It provides
+a (simple) backwards compatibility api layer to make the porting easier.
 
 Documentation
 =============

docs/source/index.rst

@@ -17,13 +17,20 @@ Pyro is a pure Python library and runs on many different platforms and Python ve
 
 Pyro is copyright © Irmen de Jong (irmen@razorvine.net | http://www.razorvine.net).  Please read :doc:`license`.
 
-Pyro can be found on Pypi as `Pyro4 <http://pypi.python.org/pypi/Pyro4/>`_.  Source on Github: https://github.com/irmen/Pyro4
+It's on Pypi as `Pyro4 <http://pypi.python.org/pypi/Pyro4/>`_.  Source on Github: https://github.com/irmen/Pyro4
+and version 5 as `Pyro5 <http://pypi.python.org/pypi/Pyro5/>`__ (`Source <https://github.com/irmen/Pyro5>`__)
 
 
-Pyro4 is considered feature complete and is now in 'maintenance' mode.
-This means that only important bug fixes and security issues will be made to Pyro4.
+.. image:: _static/pyro5.png
+    :align: right
+    :width: 120px
+
+Pyro4 is considered feature complete and new development is frozen.
+Only very important bug fixes (such as security issues) will still be made to Pyro4.
 New development, improvements and new features will only be available in its successor
-`Pyro5 <https://pyro5.readthedocs.io/>`_ . New code should use Pyro5 if possible.
+`Pyro5 <https://pyro5.readthedocs.io/>`_ . New code should use Pyro5 unless a feature
+of Pyro4 is strictly required.  Older code should consider migrating to Pyro5. It provides
+a (simple) backwards compatibility api layer to make the porting easier.
 
 
 .. toctree::

docs/source/install.rst

@@ -6,12 +6,28 @@ Installing Pyro
 
 This chapter will show how to obtain and install Pyro.
 
+Pyro5
+-----
+
+.. image:: _static/pyro5.png
+    :align: right
+    :width: 120px
+
+Pyro4 is considered feature complete and new development is frozen.
+Only very important bug fixes (such as security issues) will still be made to Pyro4.
+New development, improvements and new features will only be available in its successor
+`Pyro5 <https://pyro5.readthedocs.io/>`_ . New code should use Pyro5 unless a feature
+of Pyro4 is strictly required.  Older code should consider migrating to Pyro5. It provides
+a (simple) backwards compatibility api layer to make the porting easier.
+
+
+
 .. index::
     double: installing Pyro; requirements for Pyro
 
 Compatibility
 -------------
-Pyro is written in 100% Python. It works on any recent operating system where a suitable supported Python implementation is available
+Pyro4 is written in 100% Python. It works on any recent operating system where a suitable supported Python implementation is available
 (2.7, or 3.5 and newer). It also works with Pypy (2 and 3). Maybe it also works with other Python implementations, but those are not tested.
 (if you only need to write *client* code in Jython/Java, consider using :doc:`pyrolite` instead!)
 

src/Pyro4/constants.py

@@ -5,7 +5,7 @@
 """
 
 # Pyro version
-VERSION = "4.80.dev0"
+VERSION = "4.80"
 
 # standard object name for the Daemon object
 DAEMON_NAME = "Pyro.Daemon"