Some cleanup and fixes of warnings

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.11-slim
 
 ARG repo
 

src/dynapyt/instrument/CodeInstrumenter.py

@@ -134,12 +134,10 @@ def __create_iid(self, node):
         )
         return iid
 
-    def __create_import(self, names):
+    def __create_import(self):
         module_name = cst.Attribute(
             value=cst.Name(value="dynapyt"), attr=cst.Name(value="runtime")
         )
-        # imp_aliases = [cst.ImportAlias(name=cst.Name(value=name)) for name in names]
-        # imp = cst.ImportFrom(module=module_name, names=imp_aliases)
         imp = cst.ImportFrom(
             module=module_name,
             names=[cst.ImportAlias(name=cst.Name(value="RuntimeEngine"))],
@@ -266,7 +264,7 @@ def leave_Module(self, original_node: cst.Module, updated_node: cst.Module):
                 imports_index = i
 
         if len(import_names) > 0:
-            dynapyt_imports.append(self.__create_import(import_names))
+            dynapyt_imports.append(self.__create_import())
             dynapyt_imports.append(
                 cst.SimpleStatementLine(
                     body=[

src/dynapyt/instrument/instrument.py

@@ -42,8 +42,6 @@ def canonical_ifs(node, child_dict):
 
 def instrument_code(src, file_path, iids, selected_hooks):
     try:
-        print("Before:")
-        print(src)
         ast = cst.matchers.replace(
             cst.parse_module(src),
             cst.matchers.If(
@@ -53,8 +51,6 @@ def instrument_code(src, file_path, iids, selected_hooks):
             ),
             canonical_ifs,
         )
-        print("After:")
-        print(ast.code)
         ast_wrapper = cst.metadata.MetadataWrapper(ast)
 
         instrumented_code = CodeInstrumenter(src, file_path, iids, selected_hooks)

src/dynapyt/run_analysis.py

@@ -7,9 +7,7 @@
 from tempfile import gettempdir
 import sys
 import uuid
-import json
 from pathlib import Path
-from .utils.runtimeUtils import gather_coverage, gather_output
 from .runtime import RuntimeEngine
 
 

src/dynapyt/run_instrumentation.py

@@ -1,13 +1,9 @@
 from typing import List, Set
 import argparse
-from os import walk
-from os import path
 from pathlib import Path
 import shutil
 from subprocess import run
 import time
-from multiprocessing import Pool
-from dynapyt.utils.hooks import get_hooks_from_analysis
 from dynapyt.instrument.instrument import instrument_files
 
 
@@ -19,7 +15,6 @@ def instrument_dir(
 ):
     start_time = time.time()
     start = directory
-    all_cmds = []
 
     if isinstance(analysis, str) and Path(analysis).exists():
         with open(analysis, "r") as f:

src/dynapyt/utils/hooks.py

@@ -1,10 +1,6 @@
 from typing import Dict, List
 
-try:
-    import importlib.resources as pkg_resources
-except ImportError:
-    # Try backported to PY<37 `importlib_resources`.
-    import importlib_resources as pkg_resources
+import importlib.resources as pkg_resources
 import json
 import builtins
 import keyword
@@ -81,6 +77,6 @@ def get_hooks_from_analysis(classes: List[str]) -> Dict[str, Dict[str, List[str]
         raise e
     except ImportError as e:
         raise e
-    with pkg_resources.open_text("dynapyt.utils", "hierarchy.json") as f:
+    with pkg_resources.files("dynapyt.utils").joinpath("hierarchy.json").open("r") as f:
         hierarchy = json.load(f)
     return get_used_leaves(hierarchy, methods)

tutorial/Dockerfile

@@ -1,8 +1,4 @@
-FROM ubuntu:latest
-
-RUN apt update
-RUN apt install python3 python3-pip -y
-RUN apt install python-is-python3 -y
+FROM python:3.12-slim
 
 WORKDIR /dynapyt
 

tutorial/README.md

@@ -1,6 +1,6 @@
 # Tutorial
-This is the tutorial page for ASE 2023.
-Slides: [Google slides](https://docs.google.com/presentation/d/14eeGZm4gIznsqtAEYI5o5Ayyp2vRepdKzUTjFTksJaI/edit?usp=sharing)
+This is the tutorial page originally designed for ASE 2023. It might not be updated on every release, so please open an issue if something does not work.
+Original slides of the ASE 2023 tutorial: [Google slides](https://docs.google.com/presentation/d/14eeGZm4gIznsqtAEYI5o5Ayyp2vRepdKzUTjFTksJaI/edit?usp=sharing)
 
 Table of contents:
 - Task 0: [Setup](#setup)