From 0a66b7e9d2ba12bdc933d8953d50edadf6efa31d Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpas.com>
Date: Wed, 11 Jan 2023 21:56:05 -0700
Subject: [PATCH] Fix odd import problem

---
 app/build_containers.py       | 2 +-
 app/build_npms.py             | 2 +-
 app/data/version.txt          | 2 +-
 app/deploy_system.py          | 2 +-
 app/setup_repositories.py     | 2 +-
 app/version.py                | 2 +-
 build-shiv-package.sh         | 4 ----
 requirements.txt              | 1 -
 scripts/build_shiv_package.sh | 1 +
 9 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100755 build-shiv-package.sh

diff --git a/app/build_containers.py b/app/build_containers.py
index aa72f54b..9951d6f8 100644
--- a/app/build_containers.py
+++ b/app/build_containers.py
@@ -24,7 +24,7 @@ import os
 from decouple import config
 import subprocess
 import click
-import importlib
+import importlib.resources
 from pathlib import Path
 from .util import include_exclude_check
 
diff --git a/app/build_npms.py b/app/build_npms.py
index 905a54cd..48161248 100644
--- a/app/build_npms.py
+++ b/app/build_npms.py
@@ -21,7 +21,7 @@
 import os
 from decouple import config
 import click
-import importlib
+import importlib.resources
 from python_on_whales import docker
 from .util import include_exclude_check
 
diff --git a/app/data/version.txt b/app/data/version.txt
index 0ee3baa4..8f8652a3 100644
--- a/app/data/version.txt
+++ b/app/data/version.txt
@@ -1,2 +1,2 @@
 # This file should be re-generated running: scripts/update-version-file.sh script
-v1.0.6-alpha-ae7a17c
+v1.0.7-alpha-7edfa1b
diff --git a/app/deploy_system.py b/app/deploy_system.py
index 2fe4bbd8..250c42ba 100644
--- a/app/deploy_system.py
+++ b/app/deploy_system.py
@@ -20,7 +20,7 @@ import os
 import sys
 from python_on_whales import DockerClient
 import click
-import importlib
+import importlib.resources
 from pathlib import Path
 from .util import include_exclude_check
 
diff --git a/app/setup_repositories.py b/app/setup_repositories.py
index bb1c3c69..28ee2c9e 100644
--- a/app/setup_repositories.py
+++ b/app/setup_repositories.py
@@ -22,7 +22,7 @@ from decouple import config
 import git
 from tqdm import tqdm
 import click
-import importlib
+import importlib.resources
 from .util import include_exclude_check
 
 
diff --git a/app/version.py b/app/version.py
index 0547f0ea..70280cd4 100644
--- a/app/version.py
+++ b/app/version.py
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.
 
 import click
-import importlib
+import importlib.resources
 
 @click.command()
 @click.pass_context
diff --git a/build-shiv-package.sh b/build-shiv-package.sh
deleted file mode 100755
index f5fa58ac..00000000
--- a/build-shiv-package.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Builds the shiv "package" for distribution
-# TODO: add build version/tag to filename
-# TODO: add version info to code for version subcommand
-shiv -c laconic-so -o package/laconic-so .
diff --git a/requirements.txt b/requirements.txt
index d34ce8f8..7ee8181a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,3 @@ GitPython>=3.1.27
 tqdm>=4.64.0
 python-on-whales>=0.52.0
 click>=8.1.3
-import-resources>=5.10.2
diff --git a/scripts/build_shiv_package.sh b/scripts/build_shiv_package.sh
index 2fbd68ad..a51ae9e2 100755
--- a/scripts/build_shiv_package.sh
+++ b/scripts/build_shiv_package.sh
@@ -1,3 +1,4 @@
 # Builds the shiv "package" for distribution
+mkdir -p ./package
 version_string=$( ./scripts/update_version_file.sh)
 shiv -c laconic-so -o package/laconic-so-${version_string} .