Skip to content

Commit

Permalink
change reST extension from .txt to .rst
Browse files Browse the repository at this point in the history
GitHub automatically renders reST in files ending in .rst, but not .txt

Addresses #416
  • Loading branch information
guyer committed Dec 17, 2015
1 parent 6e897df commit 9ab1012
Show file tree
Hide file tree
Showing 52 changed files with 30 additions and 30 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions MANIFEST-WINDOWS.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
include *.txt
include *.rst

recursive-include examples *.py *.msh *.gz *.txt
recursive-include examples *.py *.msh *.gz *.rst
recursive-include fipy *.msh
include FiPy-*.win32.exe

recursive-include documentation/ *.txt
recursive-include documentation/ *.rst
recursive-exclude examples *.png *.pdf
recursive-exclude fipy *.png *.pdf

Expand Down
6 changes: 3 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include *.txt
# include MANIFEST MANIFEST.in *.txt
include *.rst
# include MANIFEST MANIFEST.in *.rst

recursive-include documentation *.txt
recursive-include documentation *.rst
recursive-exclude examples *.png *.pdf
recursive-exclude fipy *.png *.pdf

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
26 changes: 13 additions & 13 deletions documentation/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.txt'
source_suffix = '.rst'

# The encoding of source files.
#source_encoding = 'utf-8'
Expand Down Expand Up @@ -81,15 +81,15 @@

# List of directories, relative to source directory, that shouldn't be searched
# for source files.
exclude_patterns = ['fipy/generated/modules.txt',
'fipy/generated/__init__.txt',
exclude_patterns = ['fipy/generated/modules.rst',
'fipy/generated/__init__.rst',
'build',
'dist',
'FiPy.egg-info',
'documentation/_build',
'documentation/tutorial/package/generated/modules.txt',
'documentation/tutorial/package/generated/modules.rst',
'documentation/sphinxext',
'documentation/sphinxext/bibtex/bibstuff/examples/*.txt',
'documentation/sphinxext/bibtex/bibstuff/examples/*.rst',
'**/.svn',
'**/.git']

Expand All @@ -115,14 +115,14 @@

autoclass_content = "both"

autosummary_generate = ['examples/diffusion/index.txt',
'examples/convection/index.txt',
'examples/phase/index.txt',
'examples/levelSet/index.txt',
'examples/cahnHilliard/index.txt',
'examples/flow/index.txt',
'examples/reactiveWetting/index.txt',
'examples/updating/index.txt']
autosummary_generate = ['examples/diffusion/index.rst',
'examples/convection/index.rst',
'examples/phase/index.rst',
'examples/levelSet/index.rst',
'examples/cahnHilliard/index.rst',
'examples/flow/index.rst',
'examples/reactiveWetting/index.rst',
'examples/updating/index.rst']

autodoc_member_order = 'alphabetical'

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/cahnHilliard/generated/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.txt
*.rst
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/diffusion/generated/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.txt
*.rst
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/flow/generated/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.txt
*.rst
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/levelSet/generated/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.txt
*.rst
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/phase/generated/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.txt
*.rst
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion fipy/generated/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.txt
*.rst
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ def run (self):
sphinx_args = ['-a', '-E'] + sphinx_args
apidoc_args = ['--force'] + apidoc_args

apidoc.main(['sphinx-apidoc', '--output-dir=fipy/generated', '--suffix=txt']
apidoc.main(['sphinx-apidoc', '--output-dir=fipy/generated', '--suffix=rst']
+ apidoc_args + ['fipy'])
apidoc.main(['sphinx-apidoc', '--output-dir=documentation/tutorial/package/generated', '--suffix=txt']
apidoc.main(['sphinx-apidoc', '--output-dir=documentation/tutorial/package/generated', '--suffix=rst']
+ apidoc_args + ['documentation/tutorial/package'])

if self.html:
Expand All @@ -109,7 +109,7 @@ def run (self):
from docutils.core import publish_file

for xtra in ("LICENSE", "DISCLAIMER"):
publish_file(source_path="%s.txt" % xtra,
publish_file(source_path="%s.rst" % xtra,
destination_path=os.path.join(outdir, "%s.tex" % xtra),
reader_name='standalone',
parser_name='restructuredtext',
Expand Down Expand Up @@ -193,14 +193,14 @@ def run(self):
webbrowser.open("http://matforge.org/fipy/wiki/FiPyManual?action=edit", autoraise=False)

try:
f = open('README.txt', 'r')
f = open('README.rst', 'r')
long_description = '\n' + f.read() + '\n'
f.close()
except IOError, e:
long_description = ''

try:
f = open('LICENSE.txt', 'r')
f = open('LICENSE.rst', 'r')
license = '\n' + ''.join([' '*8 + l for l in f])
f.close()
except IOError, e:
Expand Down

0 comments on commit 9ab1012

Please sign in to comment.