[Bf-extensions-cvs] [4cf22894] master: Unpacking BAM wheel into versionless directory.
Sybren A. Stüvel
noreply at git.blender.org
Sat Jun 10 11:04:17 CEST 2017
Commit: 4cf22894e28a8b7261ef3564a65e73d4ef5c242d
Author: Sybren A. Stüvel
Date: Sat Jun 10 11:01:29 2017 +0200
Branches: master
https://developer.blender.org/rBA4cf22894e28a8b7261ef3564a65e73d4ef5c242d
Unpacking BAM wheel into versionless directory.
This makes it easier to see what changed when we update to a
newer version of BAM.
===================================================================
M io_blend_utils/README.md
M io_blend_utils/__init__.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/__init__.py io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/__main__.py io_blend_utils/blender_bam-unpacked.whl/bam/__main__.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/__init__.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/__init__.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_copy.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_copy.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_pack.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_pack_restore.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack_restore.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_path_remap.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_path_remap.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_path_walker.py io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_path_walker.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/cli.py io_blend_utils/blender_bam-unpacked.whl/bam/cli.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/pack.py io_blend_utils/blender_bam-unpacked.whl/bam/pack.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/utils/__init__.py io_blend_utils/blender_bam-unpacked.whl/bam/utils/__init__.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/utils/system.py io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/DESCRIPTION.rst io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/DESCRIPTION.rst
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/METADATA io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/METADATA
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/RECORD io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/RECORD
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/WHEEL io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/WHEEL
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/entry_points.txt io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/entry_points.txt
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/metadata.json io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/metadata.json
R100 io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/top_level.txt io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/top_level.txt
M io_blend_utils/install_whl.py
===================================================================
diff --git a/io_blend_utils/README.md b/io_blend_utils/README.md
index e3f3b0a0..bfff16b9 100644
--- a/io_blend_utils/README.md
+++ b/io_blend_utils/README.md
@@ -20,7 +20,7 @@ by running:
python3 install_whl.py /path/to/blender-asset-manager/dist/blender_bam-xxx.whl
-This script also updates `__init__.py` to update the version number and path of the extracted
+This script also updates `__init__.py` to update the version number of the extracted
wheel, and removes any pre-existing older versions of the BAM wheels.
The version number and `.whl` extension are maintained in the directory name on purpose.
diff --git a/io_blend_utils/__init__.py b/io_blend_utils/__init__.py
index 03cae55c..d44d4754 100644
--- a/io_blend_utils/__init__.py
+++ b/io_blend_utils/__init__.py
@@ -29,7 +29,7 @@ bl_info = {
"category": "Import-Export",
}
-BAM_WHEEL_PATH = 'blender_bam-1.1.7-py3-none-any.whl'
+BAM_WHEEL_PATH = 'blender_bam-unpacked.whl'
import logging
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/__init__.py b/io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/__init__.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/__main__.py b/io_blend_utils/blender_bam-unpacked.whl/bam/__main__.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/__main__.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/__main__.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/__init__.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/__init__.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/__init__.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/__init__.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_copy.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_copy.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_copy.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_copy.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_pack.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_pack.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_pack_restore.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack_restore.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_pack_restore.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack_restore.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_path_remap.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_path_remap.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_path_remap.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_path_remap.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_path_walker.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_path_walker.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/blend/blendfile_path_walker.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_path_walker.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/cli.py b/io_blend_utils/blender_bam-unpacked.whl/bam/cli.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/cli.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/cli.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/pack.py b/io_blend_utils/blender_bam-unpacked.whl/bam/pack.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/pack.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/pack.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/utils/__init__.py b/io_blend_utils/blender_bam-unpacked.whl/bam/utils/__init__.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/utils/__init__.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/utils/__init__.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/utils/system.py b/io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/bam/utils/system.py
rename to io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/DESCRIPTION.rst b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/DESCRIPTION.rst
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/DESCRIPTION.rst
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/DESCRIPTION.rst
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/METADATA b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/METADATA
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/METADATA
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/METADATA
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/RECORD b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/RECORD
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/RECORD
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/RECORD
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/WHEEL b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/WHEEL
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/WHEEL
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/WHEEL
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/entry_points.txt b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/entry_points.txt
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/entry_points.txt
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/entry_points.txt
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/metadata.json b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/metadata.json
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/metadata.json
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/metadata.json
diff --git a/io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/top_level.txt b/io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/top_level.txt
similarity index 100%
rename from io_blend_utils/blender_bam-1.1.7-py3-none-any.whl/blender_bam-1.1.7.dist-info/top_level.txt
rename to io_blend_utils/blender_bam-unpacked.whl/blender_bam-1.1.7.dist-info/top_level.txt
diff --git a/io_blend_utils/install_whl.py b/io_blend_utils/install_whl.py
index a2f031a5..86a8aa5d 100755
--- a/io_blend_utils/install_whl.py
+++ b/io_blend_utils/install_whl.py
@@ -27,7 +27,7 @@ def install(wheelfile: pathlib.Path):
wipe_preexisting()
print('Installing %s' % wheelfile)
- target = my_dir / wheelfile.name
+ target = my_dir / 'blender_bam-unpacked.whl'
print('Creating target directory %s' % target)
target.mkdir(parents=True)
@@ -36,7 +36,7 @@ def install(wheelfile: pathlib.Path):
version = find_version(target)
print('This is BAM version %s' % (version, ))
- update_init_file(wheelfile, version)
+ update_init_file(version)
print('Done installing %s' % wheelfile.name)
@@ -102,13 +102,11 @@ def find_version(target: pathlib.Path):
return tuple(int(x) for x in str_ver.split('.'))
-def update_init_file(wheelfile: pathlib.Path, version: tuple):
+def update_init_file(version: tuple):
import os
import re
- print('Updating __init__.py to point to this wheel.')
-
- path_line_re = re.compile(r'^BAM_WHEEL_PATH\s*=')
+ print('Updating __init__.py to have the correct version.')
version_line_re = re.compile(r'^\s+[\'"]version[\'"]: (\([0-9,]+\)),')
with open('__init__.py', 'r') as infile, \
@@ -117,8 +115,6 @@ def update_init_file(wheelfile: pathlib.Path, version: tuple):
for line in infile:
if version_line_re.match(line):
outfile.write(" 'version': %s,%s" % (version, os.linesep))
- if path_line_re.match(line):
- outfile.write("BAM_WHEEL_PATH = '%s'%s" % (wheelfile.name, os.linesep))
else:
outfile.write(line)
More information about the Bf-extensions-cvs
mailing list