Merge pull request #116 from cerc-io/dboreham/fix-imports

Fix imports

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
 

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
 

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

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
 

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
 
 

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

build-shiv-package.sh

@@ -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 .

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} .