From eff6113bdfc8682c170738091aaf75bce9af4169 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 5 Jun 2006 14:34:09 +0000 Subject: [PATCH 1/4] Added some items git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1829 d80e17d7-ff13-0410-a124-85740d801063 --- documentation/TODOLIST.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/documentation/TODOLIST.txt b/documentation/TODOLIST.txt index c7a08f37e5..ddfce38cba 100644 --- a/documentation/TODOLIST.txt +++ b/documentation/TODOLIST.txt @@ -8,7 +8,6 @@ Long term Goals - Get a decent dendritic simulation working. Figure out why out dendrite doesn't look as cool as Jim's. Why do we have thin little arms and interface splitting? - - Allow some keyword parameters to be passed to the plot() methods of viewers - Update Mayavi viewers to use TVTK (much better according to Prabhu) instead of PyVTK. From 2dfc747b36f3a78990e82be1c1881149333e51ed Mon Sep 17 00:00:00 2001 From: "Jonathan E. Guyer" Date: Mon, 5 Jun 2006 15:59:48 +0000 Subject: [PATCH 2/4] Changes to release procedures, mostly for Windows git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1830 d80e17d7-ff13-0410-a124-85740d801063 --- MANIFEST-WINDOWS.in | 2 +- MANIFEST.in | 1 - WINDOWS-INSTALLATION.txt | 4 ++-- documentation/ADMINISTRATA.txt | 16 +++++++++++----- setup.py | 6 +++--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/MANIFEST-WINDOWS.in b/MANIFEST-WINDOWS.in index 394888ee35..f3be8824cc 100644 --- a/MANIFEST-WINDOWS.in +++ b/MANIFEST-WINDOWS.in @@ -1,7 +1,7 @@ include *.txt recursive-include examples *.py *.msh *.gz *.txt -include dist/FiPy-1.1a1.win32.exe +include FiPy-*.win32.exe recursive-include documentation/ *.txt recursive-include documentation/www/ *.html *.css *.gif *.png diff --git a/MANIFEST.in b/MANIFEST.in index a7f831c05e..60966404a7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,4 +8,3 @@ include documentation/manual/reference.pdf recursive-include examples *.py *.msh *.gz recursive-include fipy *.msh -prune fipy/examples \ No newline at end of file diff --git a/WINDOWS-INSTALLATION.txt b/WINDOWS-INSTALLATION.txt index 222e41a423..5d525f2eb1 100644 --- a/WINDOWS-INSTALLATION.txt +++ b/WINDOWS-INSTALLATION.txt @@ -49,9 +49,9 @@ Download and run the Pysparse installer. Step 4: Install |FiPy| ---------------------- -http://www.ctcms.nist.gov/fipy/download/FiPy-1.1.win32.tar.gz +http://www.ctcms.nist.gov/fipy/download/FiPy-1.1.win32.zip -Download and unpack the tarball. Run the |FiPy| installer +Download and unpack the zip file. Run the |FiPy| installer ``FiPy-1.1.win32.exe``, which should be in the base FiPy-1.1 directory. diff --git a/documentation/ADMINISTRATA.txt b/documentation/ADMINISTRATA.txt index 698d20cc18..c8fd2ce245 100644 --- a/documentation/ADMINISTRATA.txt +++ b/documentation/ADMINISTRATA.txt @@ -160,9 +160,11 @@ Build a windows executable installer:: Combine the windows installer and examples into one tar ball. $ rm MANIFEST - $ python setup.py sdist --template=MANIFEST-WINDOWS.in --dist-dir=dist-windows --no-defaults $ set FIPY_VERSION=XXX - $ mv dist-windows/FiPy-${FIPY_VERSION}.tar.gz dist/FiPy-${FIPY_VERSION}.win32.tar.gz + $ ln -s dist/FiPy-${FIPY_VERSION}.win32.exe . + $ python setup.py sdist --template=MANIFEST-WINDOWS.in --dist-dir=dist-windows --no-defaults --formats=zip + $ unlink FiPy-${FIPY_VERSION}.win32.exe + $ mv dist-windows/FiPy-${FIPY_VERSION}.zip dist/FiPy-${FIPY_VERSION}.win32.zip Upload to the CTCMS website:: @@ -172,16 +174,20 @@ Upload to the CTCMS website:: when they try to upload erroneous ``\rsrc`` directories. Version 2.6.2 does not have this problem. -`Upload the release to SourceForge`_. You can use, e.g.,:: +`Upload the release to SourceForge`_ and to the `MatDL download page`_. You can use, e.g.,:: - cvs2cl.pl --branches --tagdates --utc --usermap documentation/UFILE.txt --delta version-1_0a1:HEAD --hide-filenames + $ svn log --revision HEAD:${LASTREV} -to build the ChangeLog. +to build the ChangeLog. You can determine the revision number LASTREV by examining the "Last Changed +Rev:" field given by:: + + $ svn info http://matdl-osi.org/svn/fipy/tags/version-x_y Make an announcement to `fipy@nist.gov`_ .. Upload the release to SourceForge: https://sourceforge.net/project/admin/qrs.php?package_id=&group_id=118428 +.. MatDL download page: http://matdl-osi.org/fipy/wiki/FiPyFiles .. fipy@nist.gov: mailto:fipy@nist.gov ========================================== diff --git a/setup.py b/setup.py index 5108db019e..badb21f890 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # # FILE: "setup.py" # created: 4/6/04 {1:24:29 PM} - # last update: 6/2/06 {4:20:24 PM} + # last update: 6/5/06 {11:57:11 AM} # Author: Jonathan Guyer # Author: Daniel Wheeler # Author: James Warren @@ -399,8 +399,8 @@ def run (self): os.system('ln -sf ../../manual/fipy.pdf documentation/www/download/fipy-%s.pdf'%self.distribution.metadata.get_version()) os.system('ln -sf ../../manual/reference.pdf documentation/www/download/reference-%s.pdf'%self.distribution.metadata.get_version()) - for name in ('', '.win32'): - file = 'dist/FiPy-%s%s.tar.gz'%(self.distribution.metadata.get_version(), name) + for name in ('.tar.gz', '.win32.zip'): + file = 'dist/FiPy-%s%s'%(self.distribution.metadata.get_version(), name) print "setting group and ownership for %s ..."%file os.system('chmod -R g+w %s'%file) os.system('chgrp -R pfm %s'%file) From 5c1eb8e06975d5265691b24078cadfabec3ee8da Mon Sep 17 00:00:00 2001 From: "Jonathan E. Guyer" Date: Mon, 5 Jun 2006 19:21:41 +0000 Subject: [PATCH 3/4] slightly less rude git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1831 d80e17d7-ff13-0410-a124-85740d801063 --- documentation/MAIL.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/documentation/MAIL.txt b/documentation/MAIL.txt index 61fcccf502..7abab35e6c 100644 --- a/documentation/MAIL.txt +++ b/documentation/MAIL.txt @@ -18,9 +18,7 @@ we encourage you to sign up for the mailing list by sending a Once you are subscribed, you can post messages to the list simply by addressing email to mailto:fipy@nist.gov. If you are new to mailing lists, you may want to read the following resource about asking -questions the smart way: - -http://www.catb.org/~esr/faqs/smart-questions.html +effective questions: http://www.catb.org/~esr/faqs/smart-questions.html List Archive ------------ From 32c51e7abc666d87f80a29a1c85e86b7f3e15e2d Mon Sep 17 00:00:00 2001 From: "Jonathan E. Guyer" Date: Mon, 5 Jun 2006 19:52:30 +0000 Subject: [PATCH 4/4] reST formatting issues git-svn-id: svn+ssh://code.matforge.org/fipy/trunk@1832 d80e17d7-ff13-0410-a124-85740d801063 --- documentation/manual/fipy.tex | 10 +-- documentation/www/menu.html | 2 +- setup.py | 115 ++++++++++++++++------------------ 3 files changed, 60 insertions(+), 67 deletions(-) diff --git a/documentation/manual/fipy.tex b/documentation/manual/fipy.tex index 2b4185b176..618c5dd7e7 100644 --- a/documentation/manual/fipy.tex +++ b/documentation/manual/fipy.tex @@ -4,7 +4,7 @@ % % FILE: "fipy.tex" % created: 4/1/04 {2:58:37 PM} - % last update: 5/15/06 {1:57:56 PM} + % last update: 6/5/06 {3:43:23 PM} % Author: Jonathan Guyer % E-mail: guyer@nist.gov % Author: Daniel Wheeler @@ -121,6 +121,10 @@ \chapter{Overview} \input readme +\section{Mailing List} + +\input mail + % Installation \chapter{Installation and Usage} @@ -142,10 +146,6 @@ \section{Subversion tags} \input svn -\section{Mailing List} - -\input mail - % Numerical \chapter{Theoretical and Numerical Background} diff --git a/documentation/www/menu.html b/documentation/www/menu.html index 19def5b63f..f122d7af24 100644 --- a/documentation/www/menu.html +++ b/documentation/www/menu.html @@ -10,7 +10,7 @@
  • Manual (PDF)
  • Reference (PDF)
  • Bugs, + href="http://www.nist.gov/cgi-bin/exit_nist.cgi?url=http://matdl-osi.org/fipy/report">Bugs, etc.
  • Superconformal electrodeposition
  • Mailing List
    • diff --git a/setup.py b/setup.py index badb21f890..b6560147d7 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # # FILE: "setup.py" # created: 4/6/04 {1:24:29 PM} - # last update: 6/5/06 {11:57:11 AM} + # last update: 6/5/06 {3:48:26 PM} # Author: Jonathan Guyer # Author: Daniel Wheeler # Author: James Warren @@ -218,24 +218,25 @@ def run (self): f.write('.. |VERSION| replace:: ' + self.distribution.metadata.get_version()) f.close() - mainRestructuredTextFiles = ['INSTALLATION', - 'README', - 'LICENSE', - 'DISCLAIMER', - 'examples/README', - 'examples/levelSet/electroChem/README'] + mainRestructuredTextFiles = {'article': + ['INSTALLATION', + 'README', + 'LICENSE', + 'DISCLAIMER', + 'examples/README'], + 'startlower': + ['WINDOWS-INSTALLATION', + 'examples/levelSet/electroChem/README']} + - secondaryRestructuredTextFiles = ['CREDITS', - 'TALKS', - 'TODOLIST', - 'MAIL', - 'SVN', - 'EFFICIENCY'] - - tertiaryRestructuredTextFiles = ['WINDOWS-INSTALLATION', - 'documentation/MAIL', - 'examples/levelSet/electroChem/README'] - + secondaryRestructuredTextFiles = {'article': + ['CREDITS', + 'TALKS', + 'TODOLIST', + 'SVN', + 'EFFICIENCY'], + 'startlower': + ['MAIL']} if self.latex: if self.apis: @@ -301,27 +302,23 @@ def run (self): from utils.includedLaTeXWriter import IncludedLaTeXWriter - self._translateTextFiles(files = mainRestructuredTextFiles, - source_dir = '../..', - writer = IncludedLaTeXWriter(), - settings ={'use_latex_toc': True, - 'footnote_references': 'superscript', - 'table_style': 'nolines'}) - - self._translateTextFiles(files = secondaryRestructuredTextFiles, - source_dir = '..', - writer = IncludedLaTeXWriter(), - settings ={'use_latex_toc': True, - 'footnote_references': 'superscript', - 'table_style': 'booktabs'}) - - self._translateTextFiles(files = tertiaryRestructuredTextFiles, - source_dir = '../..', - writer = IncludedLaTeXWriter(), - settings ={'use_latex_toc': True, - 'footnote_references': 'superscript', - 'table_style': 'booktabs', - 'documentclass': 'startlower'}) + for key in mainRestructuredTextFiles.keys(): + self._translateTextFiles(files = mainRestructuredTextFiles[key], + source_dir = '../..', + writer = IncludedLaTeXWriter(), + settings ={'use_latex_toc': True, + 'footnote_references': 'superscript', + 'table_style': 'nolines', + 'documentclass': key}) + + for key in mainRestructuredTextFiles.keys(): + self._translateTextFiles(files = secondaryRestructuredTextFiles[key], + source_dir = '..', + writer = IncludedLaTeXWriter(), + settings ={'use_latex_toc': True, + 'footnote_references': 'superscript', + 'table_style': 'booktabs', + 'documentclass': key}) if self.guide: os.system("pdflatex fipy") @@ -347,29 +344,23 @@ def run (self): from utils.includedHTMLWriter import IncludedHTMLWriter print "main files" - self._translateTextFiles(files = mainRestructuredTextFiles, - destination_dir = tmp, - writer = IncludedHTMLWriter(), - settings = {'initial_header_level' : 3, - 'xml_declaration' : 0}, - ext = '.html') + for key in mainRestructuredTextFiles.keys(): + self._translateTextFiles(files = mainRestructuredTextFiles[key], + destination_dir = tmp, + writer = IncludedHTMLWriter(), + settings = {'initial_header_level' : 3, + 'xml_declaration' : 0}, + ext = '.html') print "secondary files" - self._translateTextFiles(files = secondaryRestructuredTextFiles, - source_dir = "documentation", - destination_dir = tmp, - writer = IncludedHTMLWriter(), - settings = {'initial_header_level' : 3, - 'xml_declaration' : 0}, - ext = '.html') - - print "tertiary files" - self._translateTextFiles(files = tertiaryRestructuredTextFiles, - destination_dir = tmp, - writer = IncludedHTMLWriter(), - settings = {'initial_header_level' : 3, - 'xml_declaration' : 0}, - ext = '.html') + for key in secondaryRestructuredTextFiles.keys(): + self._translateTextFiles(files = secondaryRestructuredTextFiles[key], + source_dir = "documentation", + destination_dir = tmp, + writer = IncludedHTMLWriter(), + settings = {'initial_header_level' : 3, + 'xml_declaration' : 0}, + ext = '.html') import shutil for f in ['menu.html', 'meta.html', 'logo.html', 'extra.html']: @@ -416,7 +407,9 @@ def run (self): os.system('chmod -R g+w documentation/www/') print "uploading web pages..." - os.system('rsync -aLC -e ssh %s %s'%('documentation/www/', os.environ['FIPY_WWWHOST'])) + # The -t flag (implicit in -a) is suddenly causing problems + # os.system('rsync -aLC -e ssh %s %s'%('documentation/www/', os.environ['FIPY_WWWHOST'])) + os.system('rsync -rlpgoDLC -e ssh %s %s'%('documentation/www/', os.environ['FIPY_WWWHOST'])) print "activating web pages..." os.system(os.environ['FIPY_WWWACTIVATE'])