-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cherry-picked e3f9cc4^..0e1df48 matforge -> github Change links to reflect hosting at GitHub rather than MatForge catch SystemExit sphinx-doc/sphinx@edb8fd9 moved `sys.exit()` from __init__.py to sphinx.build(), so we need to catch it. Probably want to shift to "make mode" at some point. change reST extension from .txt to .rst GitHub automatically renders reST in files ending in .rst, but not .txt Addresses #416
- Loading branch information
Showing
17 changed files
with
43 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,9 +9,9 @@ Branches | |
-------- | ||
|
||
Whether fixing a bug or adding a feature, all work on FiPy should be based | ||
on a reported `Trac ticket`_. Assuming ticket number 12345, branch the code:: | ||
on a reported `GitHub issue`_. Assuming issue number 12345, branch the code:: | ||
|
||
$ BRANCH=ticket12345-Summary_of_what_branch_addresses | ||
$ BRANCH=issue12345-Summary_of_what_branch_addresses | ||
$ git checkout -b $BRANCH develop | ||
|
||
Edit and add to branch:: | ||
|
@@ -44,7 +44,7 @@ Submit branch for code review | |
|
||
**Administrators Only!** | ||
|
||
Push the code to matforge for automated testing:: | ||
Push the code to GitHub for automated testing:: | ||
|
||
$ git push origin $BRANCH | ||
|
||
|
@@ -89,7 +89,7 @@ Refactoring complete: merge branch to develop | |
|
||
$ python setup.py test | ||
|
||
Push the code to matforge for automated testing:: | ||
Push the code to GitHub for automated testing:: | ||
|
||
$ git push origin develop | ||
|
||
|
@@ -146,7 +146,7 @@ Make sure ``develop`` is ready for release:: | |
|
||
$ git checkout develop | ||
|
||
Check items in the tickets_ and update the :file:`README.txt`:: | ||
Check items in the issues_ and update the :file:`README.txt`:: | ||
|
||
$ git commit README.txt -m "REL: update new features for release" | ||
|
||
|
@@ -240,24 +240,13 @@ Upload | |
|
||
Tag the repository as appropriate (see `SVN practices`_ above). | ||
|
||
Upload the build products and documentation from :file:`dist/` to MatForge and | ||
Upload the build products and documentation from :file:`dist/` and | ||
the web site to CTCMS :: | ||
|
||
$ export FIPY_WWWHOST=bunter:/u/WWW/wd15/fipy | ||
$ export FIPY_WWWACTIVATE=updatewww | ||
$ python setup.py upload_products --pdf --html --tarball --winzip | ||
|
||
.. note:: | ||
|
||
You will need to manually upload the files | ||
|
||
* http://matforge.org/fipy/admin/general/downloader | ||
|
||
and, if appropriate, update the links to current files: | ||
|
||
* http://matforge.org/fipy/wiki/FiPyDownloadCurrent?action=edit | ||
* http://matforge.org/fipy/wiki/FiPyManual?action=edit | ||
|
||
.. warning:: Some versions of ``rsync`` on Mac OS X have caused problems | ||
when they try to upload erroneous ``\rsrc`` directories. Version 2.6.2 | ||
does not have this problem. | ||
|
@@ -267,8 +256,8 @@ Make an announcement to `[email protected]`_ | |
Build (``python setup.py bdist --formats=wininst``) a Windows `PyVTK`_ | ||
executable and upload to download page. | ||
|
||
.. _Trac ticket: http://matforge.org/fipy/newticket | ||
.. _tickets: http://matforge.org/fipy/report | ||
.. _GitHub issue: https://github.com/usnistgov/fipy/issues/new | ||
.. _issues: https://github.com/usnistgov/fipy/issues | ||
.. _Buildbot: http://build.cmi.kent.edu:8010/tgrid | ||
.. _[email protected]: mailto:[email protected] | ||
.. _PyVTK: http://cens.ioc.ee/projects/pyvtk/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,13 +86,12 @@ We have a few known, intermittent failures: | |
have an effect on actual simulations. | ||
|
||
Although the test suite may show warnings, there should be no other errors. | ||
Any errors should be investigated or reported on the `tracking | ||
system`_. Users can see if there are any known problems for the latest | ||
:term:`FiPy` distribution by checking `FiPy's automated test | ||
display`_. | ||
Any errors should be investigated or reported on the `issue tracker`_. | ||
Users can see if there are any known problems for the latest :term:`FiPy` | ||
distribution by checking `FiPy's automated test display`_. | ||
|
||
.. _FiPy's automated test display: http://build.cmi.kent.edu:8010/console | ||
.. _tracking system: http://matforge.org/fipy/newticket | ||
.. _issue tracker: https://github.com/usnistgov/fipy/issues/new | ||
|
||
Below are a number of common `Command-line Flags`_ for testing various | ||
:term:`FiPy` configurations. | ||
|
@@ -648,7 +647,7 @@ Manual | |
|
||
You can view the manual online at <http://www.ctcms.nist.gov/fipy> or you | ||
can `download the latest manual`_ from | ||
<http://matforge.org/fipy/wiki/FiPyManual>. Alternatively, | ||
<http://www.ctcms.nist.gov/fipy/download/>. Alternatively, | ||
it may be possible to build a fresh copy by issuing the following | ||
command in the base directory:: | ||
|
||
|
@@ -680,7 +679,7 @@ command in the base directory:: | |
$ pip install -e [email protected]:mcmtroffaes/pybtex-docutils.git#egg=pybtex-docutils | ||
$ pip install -e [email protected]:mcmtroffaes/sphinxcontrib-bibtex.git#egg=sphinxcontrib-bibtex | ||
|
||
.. _download the latest manual: http://matforge.org/fipy/wiki/FiPyManual | ||
.. _download the latest manual: http://www.ctcms.nist.gov/fipy/download/ | ||
.. _hg: http://mercurial.selenic.com | ||
.. _bzr: http://bazaar.canonical.com | ||
.. _git: http://git-scm.com | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters