summaryrefslogtreecommitdiff
path: root/mtraits
diff options
context:
space:
mode:
authormichele.simionato <devnull@localhost>2009-01-05 17:06:46 +0000
committermichele.simionato <devnull@localhost>2009-01-05 17:06:46 +0000
commit7a2068152e7619ca88db00252fd670d829ac1b8c (patch)
tree29380d3b17eed2775463f7c35c42b170a25ba9d4 /mtraits
parentfc780c1fc117256cf5b594ac94e03499d3de9431 (diff)
downloadmicheles-7a2068152e7619ca88db00252fd670d829ac1b8c.tar.gz
Version 0.5.1 of the strait module
Diffstat (limited to 'mtraits')
-rw-r--r--mtraits/CHANGES.txt1
-rw-r--r--mtraits/MANIFEST.in1
-rw-r--r--mtraits/Makefile3
-rw-r--r--mtraits/docs.py10
-rw-r--r--mtraits/setup.py2
5 files changed, 6 insertions, 11 deletions
diff --git a/mtraits/CHANGES.txt b/mtraits/CHANGES.txt
index b60c478..215aa89 100644
--- a/mtraits/CHANGES.txt
+++ b/mtraits/CHANGES.txt
@@ -1,6 +1,7 @@
HISTORY
-----------------------------
+0.5.1. First published version (2009-01-05)
0.5.0. Major rewriting: abandoned the original idea of traits as
mechanism to control namespace pollution and added support for
method cooperation (2008-08-31);
diff --git a/mtraits/MANIFEST.in b/mtraits/MANIFEST.in
index 216f278..44b872d 100644
--- a/mtraits/MANIFEST.in
+++ b/mtraits/MANIFEST.in
@@ -1 +1,2 @@
+include docs.pdf
exclude doc.py mtrait.py
diff --git a/mtraits/Makefile b/mtraits/Makefile
index c22ec1e..96ff8f0 100644
--- a/mtraits/Makefile
+++ b/mtraits/Makefile
@@ -1,6 +1,7 @@
+RST = python ~/trunk/ROnline/RCommon/Python/ms/tools/rst.py
MINIDOC = python ~/trunk/ROnline/RCommon/Python/ms/tools/minidoc.py
upload: docs.py strait.py
python setup.py register build sdist upload
docs: docs.py
- $(MINIDOC) -dH docs; scp /tmp/docs.html merlin.phyast.pitt.edu:public_html/python/strait.html
+ $(MINIDOC) -dH docs; scp /tmp/docs.html merlin.phyast.pitt.edu:public_html/python/strait.html; $(RST) -tp /tmp/docs.rst; mv /tmp/docs.pdf .
diff --git a/mtraits/docs.py b/mtraits/docs.py
index 85f1788..6182993 100644
--- a/mtraits/docs.py
+++ b/mtraits/docs.py
@@ -311,14 +311,6 @@ in return many advantages in terms of simplicity: for instance,
whereas we all know that the `current super in Python`_ is very far
from trivial.
-More importantly, many people use multiple inheritance incorrectly,
-confusing the ``is-a`` relation with the ``has-a`` relation; with
-traits, there is no confusion. Since there is a single base class, you
-can associate the ``is-a`` relation with the base class whereas the
-features coming from the traits correspond to ``has-a``: for instance
-in the Tkinter example a ``Widget`` *is* a ``BaseWidget`` but has the
-methods of the traits ``Pack``, ``Place`` and ``Grid``.
-
.. _current super in Python: http://www.artima.com/weblogs/viewpost.jsp?thread=236275
.. _elsewhere: http://www.artima.com/weblogs/viewpost.jsp?thread=246341
.. _PloneSite hierarchy: http://www.phyast.pitt.edu/~micheles/python/plone-hierarchy.png
@@ -682,7 +674,7 @@ thinking that the ``s`` also stands for Simionato ;)
"""
from datetime import datetime
TODAY = datetime.today().isoformat()[:10]
-VERSION = '0.5.0'
+VERSION = '0.5.1'
__doc__ = __doc__.replace('VERSION', VERSION).replace('TODAY', TODAY)
diff --git a/mtraits/setup.py b/mtraits/setup.py
index a1c2272..355274f 100644
--- a/mtraits/setup.py
+++ b/mtraits/setup.py
@@ -3,7 +3,7 @@ try:
except ImportError:
from distutils.core import setup
-VERSION = '0.5.0'
+VERSION = '0.5.1'
setup(name='strait',
version=VERSION,
description='Simple Traits for Python',