Fixed bugs and deprecated APIs

BAMresearch · Oct 15, 2023 · b31fb75 · b31fb75
1 parent 64d8536
commit b31fb75
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/amworkflow/src/infrastructure/database/cruds/crud.py b/amworkflow/src/infrastructure/database/cruds/crud.py
@@ -66,7 +66,9 @@ def query_multi_data(table: str,
             dd.pop("_sa_instance_state", None)
     if target_column_name == None:
         result = pd.DataFrame(result)
-        result.style.applymap(color_background)
+        # This line of code is deprecated informed by the author. 
+        # result.style.applymap(color_background)
+        result.style.map(color_background)
     # elif len(result) != 0:
     #     result = result[0]
     return result

diff --git a/amworkflow/src/utils/parser.py b/amworkflow/src/utils/parser.py
@@ -1,4 +1,3 @@
-import yaml
 import os
 import logging
 from amworkflow.src.constants.enums import Directory as D

diff --git a/dodo.py b/dodo.py
@@ -24,7 +24,7 @@ def task_install():
     cmd_list = []
     aw, ocu = env_check()
     if not ocu:
-        cmd_list.append("python -m pip install /amworkflow/dependencies/OCCUtils-0.1.dev0-py3-none-any.whl")
+        cmd_list.append("python -m pip install ./amworkflow/dependencies/OCCUtils-0.1.dev0-py3-none-any.whl")
         cmd_list.append('echo occ-utils installed successfully.')
     else:
         cmd_list.append('echo occ-utils already installed.')

diff --git a/environment_clean.yml b/environment_clean.yml
@@ -1,4 +1,4 @@
-name: amworkflow_clean
+name: amworkflow
 channels:
   - conda-forge
   - defaults
@@ -11,6 +11,8 @@ dependencies:
   - fenics-dolfinx
   - mpich
   - pyvista
+  - doit
+  - tomlkit
   - pip
   - pip:
     - gmsh==4.11.1
@@ -20,3 +22,4 @@ dependencies:
     - sqlalchemy
     - ruamel-yaml
     - doit
+    - psutil
diff --git a/pyproject.toml b/pyproject.toml
@@ -17,6 +17,12 @@ classifiers = [
 license = {file = "LICENSE"}
 keywords = ["AM concrete", "workflow", "CAD"]
 dependencies = [
+    "gmsh>=4.11.1",
+    "networkx",
+    "sphinx",
+    "sqlalchemy",
+    "ruamel-yaml",
+    "doit"
 ]
 
 [project.urls]

diff --git a/setup.py b/setup.py
@@ -9,5 +9,14 @@
     license='MIT',
     author='Yuxiang He',
     author_email='[email protected]',
-    description=''
-)
+    description='',
+    install_requires=[
+        "gmsh>=4.11.1",
+        "networkx",
+        "sphinx",
+        "sqlalchemy",
+        "ruamel-yaml",
+        "psutil",
+        "pyqt5"
+    ]
+)