diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 08:54:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 08:54:47 +0300 |
commit | 49b86bcfec6885952458b3791cfc599463f02a35 (patch) | |
tree | 902cce1e99b2f5182c3a87640d36a310748dc62b /doc | |
parent | 53c63db2ee1bd544384840915c7f562819a7dbbc (diff) | |
parent | cd17b3258327522b8c6f56a3ee7239a91f2be149 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'doc')
-rw-r--r-- | doc/python_api/sphinx_doc_gen_monkeypatch.py | 2 | ||||
-rwxr-xr-x | doc/python_api/sphinx_doc_update.py | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/doc/python_api/sphinx_doc_gen_monkeypatch.py b/doc/python_api/sphinx_doc_gen_monkeypatch.py index 9fdbf613d96..58d09f71e9a 100644 --- a/doc/python_api/sphinx_doc_gen_monkeypatch.py +++ b/doc/python_api/sphinx_doc_gen_monkeypatch.py @@ -21,7 +21,7 @@ # <pep8 compliant> bpy_types_Operator_bl_property__doc__ = ( -""" + """ The name of a property to use as this operators primary property. Currently this is only used to select the default property when expanding an operator into a menu. diff --git a/doc/python_api/sphinx_doc_update.py b/doc/python_api/sphinx_doc_update.py index 561e58dec66..af44137aca4 100755 --- a/doc/python_api/sphinx_doc_update.py +++ b/doc/python_api/sphinx_doc_update.py @@ -29,7 +29,7 @@ You'll need to specify your user login and password, obviously. Example usage: - ./sphinx_doc_update.py --mirror ../../../docs/remote_api_backup/ --source ../.. --blender ../../../build_cmake/bin/blender --user foobar --password barfoo + ./sphinx_doc_update.py --mirror ../../../docs/remote_api_backup/ --source ../.. --blender ../../../build_cmake/bin/blender --user foobar --password barfoo """ @@ -107,14 +107,16 @@ def main(): with tempfile.TemporaryDirectory() as tmp_dir: # II) Generate doc source in temp dir. - doc_gen_cmd = (args.blender, "--background", "-noaudio", "--factory-startup", "--python-exit-code", "1", - "--python", "%s/doc/python_api/sphinx_doc_gen.py" % args.source_dir, "--", - "--output", tmp_dir) + doc_gen_cmd = ( + args.blender, "--background", "-noaudio", "--factory-startup", "--python-exit-code", "1", + "--python", "%s/doc/python_api/sphinx_doc_gen.py" % args.source_dir, "--", + "--output", tmp_dir + ) subprocess.run(doc_gen_cmd) # III) Get Blender version info. getver_file = os.path.join(tmp_dir, "blendver.txt") - getver_script = ("" + getver_script = ( "import sys, bpy\n" "with open(sys.argv[-1], 'w') as f:\n" " is_release = bpy.app.version_cycle in {'rc', 'release'}\n" @@ -124,7 +126,8 @@ def main(): " f.write('%d.%d%s\\n' % (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)\n" " if is_release else '%s\\n' % branch)\n" " f.write('%d_%d%s_release' % (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)\n" - " if is_release else '%d_%d_%d' % bpy.app.version)\n") + " if is_release else '%d_%d_%d' % bpy.app.version)\n" + ) get_ver_cmd = (args.blender, "--background", "-noaudio", "--factory-startup", "--python-exit-code", "1", "--python-expr", getver_script, "--", getver_file) subprocess.run(get_ver_cmd) |