Commit 8dcfcfa3 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Fix quote issues.

parent 32298b74
......@@ -119,11 +119,11 @@ def commit_release():
call(["git", "checkout", "master"], stdout=fi, stderr=fi)
# Commit modified files
print '\n\tgit add', DBUIJS, CHANGELOG, VERSION
print "\n\tgit add", DBUIJS, CHANGELOG, VERSION
call(["git", "add", DBUIJS, CHANGELOG, VERSION])
msg = "Start release candidate %s" % get_version()
print '\tgit commit:', msg
print "\tgit commit:", msg
call(["git", "commit", "-m", msg])
......@@ -158,12 +158,12 @@ def get_plugin_version(plugin):
elif plugin == "extjs":
fn = os.path.join('static', 'plugin_extjs', 'version.properties')
fn = os.path.join("static", "plugin_extjs", "version.properties")
if not os.path.exists(fn):
error("\n\tNo version file for the plugin extjs !")
sys.exit(1)
with open(fn, 'rb') as fi:
with open(fn, "rb") as fi:
s = fi.read()
match = re.search(r"version.release=(\d+(\.\d+)*)", s)
......@@ -174,14 +174,14 @@ def get_plugin_version(plugin):
release = match.group(1)
# shrink the release identifier 4.2.1 or 4.2.1.883 -> 421
li = release.split('.')
release = ''.join(li) if len(li) < 4 else ''.join(li[:-1])
li = release.split(".")
release = "".join(li) if len(li) < 4 else "".join(li[:-1])
elif plugin == "mathjax":
filename = os.path.join('static', 'plugin_mathjax', 'MathJax.js')
filename = os.path.join("static", "plugin_mathjax", "MathJax.js")
with open(filename, 'rb') as tmpfile:
with open(filename, "rb") as tmpfile:
text = tmpfile.read()
match = re.match(r'.+MathJax.version="(\d+(\.\d+)*)";', text, re.DOTALL)
......@@ -228,52 +228,52 @@ def set_version(version):
print "\n\tRelease %s already exit in git" % version
sys.exit(1)
print '\tSet release', version, 'in', DBUIJS
print "\tSet release", version, "in", DBUIJS
with open(DBUIJS) as fi:
txt = fi.read()
# look for a pattern Dbui.version = '0.8.3'; in appbase.js
# look for a pattern Dbui.version = "0.8.3"; in appbase.js
# split the the string in 3 parts (pre, version, post)
match = re.match(r"(.+ version: ')([\w._-]*)('.+)", txt, re.DOTALL)
match = re.match(r'(.+ version: ")([\w._-]*)(".+)', txt, re.DOTALL)
if match.group(2) == version:
msg = '\n\tVersion "%s" already exists in the Dbui.js file !'
msg = "\n\tVersion '%s' already exists in the Dbui.js file !"
print msg % version
rep = raw_input('\tDo you want to continue [n]? ')
if rep not in ('y', 'yes'):
rep = raw_input("\tDo you want to continue [n]? ")
if rep not in ("y", "yes"):
sys.exit(1)
# update the version and write a new file
txt = match.group(1) + version + match.group(3)
with open(DBUIJS, 'w') as fi:
with open(DBUIJS, "w") as fi:
fi.write(txt)
# look for a pattern HEAD in the CHANGELOG
# split the the string in 2 parts (pre HEAD, post HEAD)
print '\tSet release', version, 'in', CHANGELOG
print "\tSet release", version, "in", CHANGELOG
with open(CHANGELOG) as fi:
txt = fi.read()
match = re.match("(.+HEAD\n)(.*)", txt, re.DOTALL)
if match is None:
print '\n\tNo HEAD tag in the CHANGELOG!\n'
rep = raw_input('\tDo you want to continue [n]?')
if rep not in ('y', 'yes'):
print "\n\tNo HEAD tag in the CHANGELOG!\n"
rep = raw_input("\tDo you want to continue [n]?")
if rep not in ("y", "yes"):
sys.exit(1)
# update the version and edit the CHANGELOG
tpl = (match.group(1), version, NOW.strftime('%b %Y'), match.group(2))
txt = '%s\n%s (%s)\n%s' % tpl
tpl = (match.group(1), version, NOW.strftime("%b %Y"), match.group(2))
txt = "%s\n%s (%s)\n%s" % tpl
with open(CHANGELOG, 'w') as fi:
with open(CHANGELOG, "w") as fi:
fi.write(txt)
call(["vim", CHANGELOG])
# update VERSION
print '\tSet release', version, 'in', VERSION
with open(VERSION, 'w') as fi:
print "\tSet release", version, "in", VERSION
with open(VERSION, "w") as fi:
fi.write(version)
# cleaning
......
......@@ -19,66 +19,66 @@ from datetime import datetime
def get_plugin_dbui_release():
JSBASE = '../../static/plugin_dbui/src/Dbui.js'
s = open(JSBASE, 'rb').read()
m = re.match("(.+ version: ')([\w._-]*)('.+)", s, re.DOTALL)
JSBASE = "../../static/plugin_dbui/src/Dbui.js"
s = open(JSBASE, "rb").read()
m = re.match('(.+ version: ")([\w._-]*)(".+)', s, re.DOTALL)
return m.group(2)
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath('../../modules'))
# sys.path.insert(0, os.path.abspath("."))
sys.path.insert(0, os.path.abspath("../../modules"))
# docker image
if os.path.exists("/opt/web2py"):
sys.path.insert(0, os.path.abspath('/opt/web2py'))
sys.path.insert(0, os.path.abspath("/opt/web2py"))
# older running environment
else:
sys.path.insert(0, os.path.abspath('../../../web2py'))
sys.path.insert(0, os.path.abspath("../../../web2py"))
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
# needs_sphinx = '1.0'
# needs_sphinx = "1.0"
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'sphinx.ext.intersphinx',
'sphinx.ext.napoleon',
'sphinx.ext.todo',
'sphinx.ext.mathjax',
'sphinx.ext.viewcode']
# coming with Sphinx (named "sphinx.ext.*") or your custom ones.
extensions = ["sphinx.ext.autodoc",
"sphinx.ext.autosummary",
"sphinx.ext.intersphinx",
"sphinx.ext.napoleon",
"sphinx.ext.todo",
"sphinx.ext.mathjax",
"sphinx.ext.viewcode"]
# autosummary configuration
autosummary_generate = False
# intersphinx configuration
intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
intersphinx_mapping = {"python": ("http://docs.python.org/2.7", None)}
# napoleon configuration
napoleon_user_rtype = False
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]
# The suffix of source filenames.
source_suffix = '.rst'
source_suffix = ".rst"
# The encoding of source files.
# source_encoding = 'utf-8-sig'
# source_encoding = "utf-8-sig"
# The master toctree document.
master_doc = 'index'
master_doc = "index"
# General information about the project.
now = datetime.now()
project = u'plugin_dbui'
copyright = u'2009-%s, R. Le Gac, licensed under CeCILL' % now.year
project = u"plugin_dbui"
copyright = u"2009-%s, R. Le Gac, licensed under CeCILL" % now.year
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
......@@ -88,7 +88,7 @@ copyright = u'2009-%s, R. Le Gac, licensed under CeCILL' % now.year
release = get_plugin_dbui_release()
# The short X.Y version.
version = release[:release.rfind('.')]
version = release[:release.rfind(".")]
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......@@ -96,18 +96,18 @@ version = release[:release.rfind('.')]
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
# today = ''
# today = ""
# Else, today_fmt is used as the format for a strftime call.
# today_fmt = '%B %d, %Y'
# today_fmt = "%B %d, %Y"
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['_build']
exclude_patterns = ["_build"]
# The reST default role (used for this markup: `text`) to use for all documents.
# default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
# If true, "()" will be appended to :func: etc. cross-reference text.
# add_function_parentheses = True
# If true, the current module name will be prepended to all description
......@@ -119,7 +119,7 @@ exclude_patterns = ['_build']
# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = "sphinx"
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
......@@ -129,7 +129,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'sphinxdoc'
html_theme = "sphinxdoc"
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
......@@ -158,11 +158,11 @@ html_theme = 'sphinxdoc'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
# html_static_path = ['_static']
# html_static_path = ["_static"]
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# If not "", a "Last updated on:" timestamp is inserted at every page bottom,
# using the given strftime format.
# html_last_updated_fmt = '%b %d, %Y'
# html_last_updated_fmt = "%b %d, %Y"
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
......@@ -196,33 +196,33 @@ html_theme = 'sphinxdoc'
# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
# html_use_opensearch = ''
# html_use_opensearch = ""
# This is the file name suffix for HTML files (e.g. ".xhtml").
# html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'plugin_dbuidoc'
htmlhelp_basename = "plugin_dbuidoc"
# -- Options for LaTeX output --------------------------------------------------
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
# 'papersize': 'letterpaper',
# The paper size ("letterpaper" or "a4paper").
# "papersize": "letterpaper",
# The font size ('10pt', '11pt' or '12pt').
# 'pointsize': '10pt',
# The font size ("10pt", "11pt" or "12pt").
# "pointsize": "10pt",
# Additional stuff for the LaTeX preamble.
# 'preamble': '',
# "preamble": "",
}
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'plugin_dbui.tex', u'plugin\\_dbui Documentation',
u'R. Le Gac', 'manual'),
("index", "plugin_dbui.tex", u"plugin\\_dbui Documentation",
u"R. Le Gac", "manual"),
]
# The name of an image file (relative to this directory) to place at the top of
......@@ -251,8 +251,8 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'plugin_dbui', u'plugin_dbui Documentation',
[u'R. Le Gac'], 1)
("index", "plugin_dbui", u"plugin_dbui Documentation",
[u"R. Le Gac"], 1)
]
# If true, show URL addresses after external links.
......@@ -265,9 +265,9 @@ man_pages = [
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'plugin_dbui', u'plugin_dbui Documentation',
u'R. Le Gac', 'plugin_dbui', 'One line description of project.',
'Miscellaneous'),
("index", "plugin_dbui", u"plugin_dbui Documentation",
u"R. Le Gac", "plugin_dbui", "One line description of project.",
"Miscellaneous"),
]
# Documents to append as an appendix to all manuals.
......@@ -276,5 +276,5 @@ texinfo_documents = [
# If false, no module index is generated.
# texinfo_domain_indices = True
# How to display URL addresses: 'footnote', 'no', or 'inline'.
# texinfo_show_urls = 'footnote'
# How to display URL addresses: "footnote", "no", or "inline".
# texinfo_show_urls = "footnote"
......@@ -20,41 +20,41 @@ from datetime import datetime
def get_plugin_dbui_release():
JSBASE = '../../static/plugin_dbui/src/Dbui.js'
s = open(JSBASE, 'rb').read()
m = re.match("(.+ version: ')([\w._-]*)('.+)", s, re.DOTALL)
JSBASE = "../../static/plugin_dbui/src/Dbui.js"
s = open(JSBASE, "rb").read()
m = re.match('(.+ version: ")([\w._-]*)(".+)', s, re.DOTALL)
return m.group(2)
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.insert(0, os.path.abspath('.'))
# sys.path.insert(0, os.path.abspath("."))
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
# needs_sphinx = '1.0'
# needs_sphinx = "1.0"
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.todo']
# coming with Sphinx (named "sphinx.ext.*") or your custom ones.
extensions = ["sphinx.ext.todo"]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]
# The suffix of source filenames.
source_suffix = '.rst'
source_suffix = ".rst"
# The encoding of source files.
# source_encoding = 'utf-8-sig'
# source_encoding = "utf-8-sig"
# The master toctree document.
master_doc = 'index'
master_doc = "index"
# General information about the project.
now = datetime.now()
project = u'plugin_dbui'
copyright = u'2009-%s by Renaud Le Gac, licensed under CeCILL' % now.year
project = u"plugin_dbui"
copyright = u"2009-%s by Renaud Le Gac, licensed under CeCILL" % now.year
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
......@@ -64,7 +64,7 @@ copyright = u'2009-%s by Renaud Le Gac, licensed under CeCILL' % now.year
release = get_plugin_dbui_release()
# The short X.Y version.
version = release[:release.rfind('.')]
version = release[:release.rfind(".")]
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......@@ -72,9 +72,9 @@ version = release[:release.rfind('.')]
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
# today = ''
# today = ""
# Else, today_fmt is used as the format for a strftime call.
# today_fmt = '%B %d, %Y'
# today_fmt = "%B %d, %Y"
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
......@@ -83,7 +83,7 @@ exclude_patterns = []
# The reST default role (used for this markup: `text`) to use for all documents.
# default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
# If true, "()" will be appended to :func: etc. cross-reference text.
# add_function_parentheses = True
# If true, the current module name will be prepended to all description
......@@ -95,7 +95,7 @@ exclude_patterns = []
# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = "sphinx"
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
......@@ -105,7 +105,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'sphinxdoc'
html_theme = "sphinxdoc"
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
......@@ -134,11 +134,11 @@ html_theme = 'sphinxdoc'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
# html_static_path = ['_static']
# html_static_path = ["_static"]
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# If not "", a "Last updated on:" timestamp is inserted at every page bottom,
# using the given strftime format.
# html_last_updated_fmt = '%b %d, %Y'
# html_last_updated_fmt = "%b %d, %Y"
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
......@@ -172,33 +172,33 @@ html_theme = 'sphinxdoc'
# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
# html_use_opensearch = ''
# html_use_opensearch = ""
# This is the file name suffix for HTML files (e.g. ".xhtml").
# html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'plugin_dbuidoc'
htmlhelp_basename = "plugin_dbuidoc"
# -- Options for LaTeX output --------------------------------------------------
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
# 'papersize': 'letterpaper',
# The paper size ("letterpaper" or "a4paper").
# "papersize": "letterpaper",
# The font size ('10pt', '11pt' or '12pt').
# 'pointsize': '10pt',
# The font size ("10pt", "11pt" or "12pt").
# "pointsize": "10pt",
# Additional stuff for the LaTeX preamble.
# 'preamble': '',
# "preamble": "",
}
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'plugin_dbui.tex', u'plugin\\_dbui Documentation',
u'R. Le Gac', 'manual'),
("index", "plugin_dbui.tex", u"plugin\\_dbui Documentation",
u"R. Le Gac", "manual"),
]
# The name of an image file (relative to this directory) to place at the top of
......@@ -227,8 +227,8 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'plugin_dbui', u'plugin_dbui Documentation',
[u'R. Le Gac'], 1)
("index", "plugin_dbui", u"plugin_dbui Documentation",
[u"R. Le Gac"], 1)
]
# If true, show URL addresses after external links.
......@@ -241,9 +241,9 @@ man_pages = [
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'plugin_dbui', u'plugin_dbui Documentation',
u'R. Le Gac', 'plugin_dbui', 'One line description of project.',
'Miscellaneous'),
("index", "plugin_dbui", u"plugin_dbui Documentation",
u"R. Le Gac", "plugin_dbui", "One line description of project.",
"Miscellaneous"),
]
# Documents to append as an appendix to all manuals.
......@@ -252,5 +252,5 @@ texinfo_documents = [
# If false, no module index is generated.
# texinfo_domain_indices = True
# How to display URL addresses: 'footnote', 'no', or 'inline'.
# texinfo_show_urls = 'footnote'
# How to display URL addresses: "footnote", "no", or "inline".
# texinfo_show_urls = "footnote"
......@@ -602,7 +602,7 @@ def get_versions():
fn = opj(server_path, "static", "plugin_dbui", "src", "Dbui.js")
with open(fn, "rb") as fi:
s = fi.read()
m = re.match("(.+ version: ')([\w._-]*)('.+)", s, re.DOTALL)
m = re.match('(.+ version: ")([\w._-]*)(".+)', s, re.DOTALL)
dbui = m.group(2)
# plugin Ext JS
......
......@@ -50,7 +50,7 @@ Ext.define("Dbui.grid.property.Preferences", {
* It contains two entry the property definition and the property name.
* The former will be displayed as a tool tip.
*/
propertyTemplate: "<div data-qtip='{0}' data-qtitle='{1}" data-qwidth='200'>{2}</div>",
propertyTemplate: "<div data-qtip='{0}' data-qtitle='{1}' data-qwidth='200'>{2}</div>",
// private
// The Ext.data.Store containing the properties and their values.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment