# HG changeset patch # User Roger Gammans # Date 1302205996 -3600 # Node ID d7591777a9f60ed3ed2b2d48119c16cd40300a45 # Parent b638c5ec48a9872f5b7ef8de9e2e72d865643cef New installer,README and version bump for 0.14 diff -r b638c5ec48a9 -r d7591777a9f6 MysteryMachine/Ui/wx/__init__.py --- a/MysteryMachine/Ui/wx/__init__.py Thu Apr 07 20:51:36 2011 +0100 +++ b/MysteryMachine/Ui/wx/__init__.py Thu Apr 07 20:53:16 2011 +0100 @@ -50,7 +50,7 @@ """ NAME = "MysteryMachine" -VERSION = "0.14pre" +VERSION = "0.14" WEBSITE = "http://trac.backslashat.org/mysterymachine" ID_NEW=wx.ID_NEW diff -r b638c5ec48a9 -r d7591777a9f6 README --- a/README Thu Apr 07 20:51:36 2011 +0100 +++ b/README Thu Apr 07 20:53:16 2011 +0100 @@ -28,6 +28,11 @@ to build you own source distribution and install from that. +You will also find it useful to install wxPython and mercurial (at least 1.3) +seperately . Similiary bpython is recommended for cli affiondadios on platforms +which support it. + + Windows Install Quick Reference ------------------------------- @@ -36,21 +41,23 @@ doing this 1. Download a recent Python (2.6.x is recommended) from www.python.org and install it. - 2. Download mercurial from http://bitbucket.org/tortoisehg/thg-winbuild/downloads/ and install it. - 3. From the MysteryMachine zip file run - python install -d c:\mysterymachine + 2. Download a recent wxPython (2.8.10 is recommoned) from www.wxpython.org and install it. + 3. Download mercurial from http://bitbucket.org/tortoisehg/thg-winbuild/downloads/ and install it. + 4. From the MysteryMachine zip file run + python setup.py install -d c:\mysterymachine - 4. Find where your TCL scripts are stored , this will normally by c:\pythonXX\tcl\tclY.Y - then edit c:\mysterymachine\scripts\activate to add this following line at - the beginning:- - set TCL_LIBRARY=c:\pythonXX\tcl\tclY,Z - - where X,Y are version numbers in the file names, eg if you have a folder of yout - computer called c:\python26\tcl\tcl8.5 you woud add this line:= - set TCL_LIBRARY=c:\python26\tcl\tcl8.5 + 5 Add a Link to the mmcli.exe and mmwx.exe scripts to your Start Menu. - 5. Run c:\mysterymachine\scripts\activate - 6. You ready to go - make sure you + +Installation on Debian/Unbuntu +------------------------------ + + 1. Run 'aptitude install python2.6 python-wxgtk2.8 mercurial' + 2. From the MysteryMachine zip file run + python setup.py install -d /opt/mysterymachine + + 3 Add a Link to the /opt/mysterynachine/mmcli and /opt/mysterymachine/binmmwx + to your desktop Libraries Required @@ -59,21 +66,15 @@ You will need to install the following Python packages to use the MysteryMachine . -Yapsy > 1.7 : A Patch for versions lower than this can be found patches pyparsing > 1.5.0 +mercurial > 1.3.1 Yapsy ''''' -Yapsy does not currently meet our python3 requirements, and in fact the use of -exec, rather than execfile creates a small security race hazard. Wether -our application's useis sensitive enough to worry about this is a moot point -though. +Yapsy does not currently meet our python3 or other requirements. -Having said that since for python3 we need to fix yapsy - changing it to be -secure as well strikes me as a good idea. - -Additionall MysteryMachine ships with a patched ersion of Yapsy which should -be backwardly compatible with 1.7 - but add a filter mechanism which is currently +MysteryMachine ships with a patched version of Yapsy which should +be backwardly compatible with 1.7 - but adds a filter mechanism which is currently used so we ignore UnTrusted plugins. Pyparsing @@ -101,7 +102,7 @@ it require python2.X-dev and working C toolchain installed . But that is quite common on Unix machines. -I haven't yet worked out the best to get Mercurial installed appropriately on windows, +I haven't yet worked out the best to get Mercurial installed automatically on windows, due to the common lack of Visual Studio , which is required to build the C extension parts. However a binary version which can be used a a library can be downloaded from http://bitbucket.org/tortoisehg/thg-winbuild/downloads/ @@ -174,3 +175,13 @@ Similiarily this supports auto-completion and pop-up documentation but where as Bpython will show the complete docstring, Idle tries to shorten it. + + +GUI +''' + +Your more likely to be interested in running the New MysteryMachine GUI +and this can be starting by running the mmwx binary from either the bin +or scripts directory depending on your platform. + + diff -r b638c5ec48a9 -r d7591777a9f6 pavement.py --- a/pavement.py Thu Apr 07 20:51:36 2011 +0100 +++ b/pavement.py Thu Apr 07 20:53:16 2011 +0100 @@ -52,7 +52,9 @@ DIST_PACKAGES = [ "yapsy" , "MysteryMachine","MysteryMachine.schema", "MysteryMachine.store","MysteryMachine.parsetools", - "MysteryMachine.Ui","MysteryMachine.utils", + "MysteryMachine.Ui", + "MysteryMachine.Ui.wx","MysteryMachine.Ui.wx.dialogs", + "MysteryMachine.utils", "MysteryMachine.policies" , "MysteryMachine.document" ] PY_MODULES = [ 'pyparsing' ] @@ -60,7 +62,7 @@ #Mercurial and pyaprsing (as of 1.5.2 ) don't install with easy_install. EZ_PACKAGES = ["docutils" , # "mercurial" , - "bpython" , +# "bpython" , # We add bpython back in later... # "pyparsing > 1.5" , "PyYaml"] @@ -168,8 +170,10 @@ @task def test_installed(): - """Run MysteryMachine units tests on the Install MysteryMachine distribution - with the default python""" + """Run MysteryMachine units tests on the Installed MysteryMachine distribution + with the current python""" + global PYTHONS + PYTHONS = [ sys.executable ] _do_test() def _do_test(path_prefix=[]): @@ -252,13 +256,6 @@ #**** NEVER GETS HERE - Relaunch DOES NOT RETURN**** if sys.platform[:3] == 'win': - #Bpython doesn't work under windows to remove it from the - # deps list - if 'bpython' in options.virtualenv.packages_to_install: - options.virtualenv.packages_to_install.remove('bpython') - if 'bpython' in options.setup.install_requires: - options.setup.install_requires.remove('bpython') - try: ##This is a workaround for issue 40 in virtualenv import FixTk @@ -272,7 +269,11 @@ options.setup.py_modules += ['FixTk'] except ImportError: pass - + else: + #Bpython is worth install on the Unix & Macs. + if 'bpython' not in options.virtualenv.packages_to_install: + options.virtualenv.packages_to_install.append('bpython') + @task @needs('dst_environ') def install_here(): @@ -347,7 +348,7 @@ packages = DIST_PACKAGES , scripts = SCRIPTS , py_modules =PY_MODULES, - version = "0.1.3pre", + version = "0.1.4", install_requires = EZ_PACKAGES, url="http://trac.backslashat.org/MysteryMachine", author="Roger Gammans", @@ -355,7 +356,8 @@ license = "GPLv2", entry_points={ 'console_scripts': [ "mysterymachine = MysteryMachine.Main:main", - "mmcli = MysteryMachine.Ui.cli:main" + "mmcli = MysteryMachine.Ui.cli:main", + "mmwx = MysteryMachine.Ui.wx:main" ]}, package_data= paver.setuputils.find_package_data(".", package="paver", only_in_packages=False),