Unpacking BAM wheel into versionless directory.

This makes it easier to see what changed when we update to a
newer version of BAM.

23 files changed, 6 insertions, 10 deletions

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
index cd0a5014..cd0a5014 100644
--- 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
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
index c5f166b0..c5f166b0 100644
--- 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
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
index e69de29b..e69de29b 100644
--- 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
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
index e471beae..e471beae 100644
--- 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
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
index 595f2b0f..595f2b0f 100644
--- 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
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
index 39c97ea1..39c97ea1 100644
--- 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
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
index 653d362f..653d362f 100644
--- 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
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
index 3b792c3a..3b792c3a 100644
--- 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
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
index df07235e..df07235e 100644
--- 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
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
index ef7dfe47..ef7dfe47 100644
--- 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
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
index 8df5b9d4..8df5b9d4 100644
--- 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
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
index e69de29b..e69de29b 100644
--- 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
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
index 313173ee..313173ee 100644
--- 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
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
index f6839507..f6839507 100644
--- 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
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
index 84bfb16d..84bfb16d 100644
--- 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
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
index 5fc033af..5fc033af 100644
--- 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
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
index a68f0882..a68f0882 100644
--- 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
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
index cff8d5d5..cff8d5d5 100644
--- 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
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
index 2d2cfe9d..2d2cfe9d 100644
--- 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
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
index 974e5b15..974e5b15 100644
--- 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
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)