table-step 2023.11.10__tar.gz → 2025.6.1__tar.gz

{table_step-2023.11.10 → table_step-2025.6.1}/HISTORY.rst

@@ -1,6 +1,11 @@
 =======
 History
 =======
+2025.6.1 -- Enhancement to allow paths with directories.
+    * As in reading/writing structures, paths beginning with '/' are relative to the
+      root of the job, and relative paths are relative to the directory where the table
+      step is invoked.
+
 2023.11.10 -- Bugfix: title of edit dialog was wrong
 
 2023.10.30 -- Cleaned up output

{table_step-2023.11.10 → table_step-2025.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: table_step
-Version: 2023.11.10
+Version: 2025.6.1
 Summary: A SEAMM plug-in for data tables in a flowchart.
 Home-page: https://github.com/molssi-seamm/table_step
 Author: Paul Saxe
@@ -28,6 +28,18 @@ Requires-Dist: openpyxl
 Requires-Dist: pandas
 Requires-Dist: seamm
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 ===================
 SEAMM Table Plug-in
@@ -95,6 +107,11 @@ award OAC-1547580 and CHE-2136142.
 =======
 History
 =======
+2025.6.1 -- Enhancement to allow paths with directories.
+    * As in reading/writing structures, paths beginning with '/' are relative to the
+      root of the job, and relative paths are relative to the directory where the table
+      step is invoked.
+
 2023.11.10 -- Bugfix: title of edit dialog was wrong
 
 2023.10.30 -- Cleaned up output

{table_step-2023.11.10 → table_step-2025.6.1}/table_step/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-11-10T05:59:18-0500",
+ "date": "2025-06-01T13:14:03-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "1cf185c4d06adec4149004f1993933d768a2beac",
- "version": "2023.11.10"
+ "full-revisionid": "d680570162e73b58623be1fffda786746e73f75e",
+ "version": "2025.6.1"
 }
 '''  # END VERSION_JSON
 

{table_step-2023.11.10 → table_step-2025.6.1}/table_step/table.py

@@ -3,8 +3,7 @@
 """Non-graphical part of the Table step in SEAMM"""
 
 import logging
-import os.path
-from pathlib import PurePath
+from pathlib import Path, PurePath
 
 import numpy as np
 import pandas
@@ -208,6 +207,9 @@ class Table(seamm.Node):
         )
         tablename = P["table name"]
 
+        # Pathnames are relative to current working directory
+        wd = Path(self.directory).parent
+
         # Print out header to the main output
         printer.important(self.description_text(P))
         printer.important("")
@@ -330,16 +332,21 @@ class Table(seamm.Node):
                 file_type = P["file type"]
                 table_handle = self.get_variable(tablename)
                 table = table_handle["table"]
+
                 if P["method"] == "Save as":
-                    filename = P["filename"]
+                    filename = P["filename"].strip()
+                    if filename.startswith("/"):
+                        filename = str(
+                            Path(self.flowchart.root_directory) / filename[1:]
+                        )
+                    else:
+                        filename = str(wd / filename)
                     table_handle["filename"] = filename
                 else:
                     if "filename" not in table_handle:
                         if file_type == "from extension":
                             file_type = ".csv"
-                        table_handle["filename"] = os.path.join(
-                            self.flowchart.root_directory, tablename + file_type
-                        )
+                        table_handle["filename"] = str(wd / tablename) + file_type
                     filename = table_handle["filename"]
 
                 index = table_handle["index column"]

{table_step-2023.11.10 → table_step-2025.6.1}/table_step/table_parameters.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Control parameters for loops
-"""
+"""Control parameters for tables"""
 
 import logging
 import seamm

{table_step-2023.11.10 → table_step-2025.6.1}/table_step.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: table-step
-Version: 2023.11.10
+Metadata-Version: 2.4
+Name: table_step
+Version: 2025.6.1
 Summary: A SEAMM plug-in for data tables in a flowchart.
 Home-page: https://github.com/molssi-seamm/table_step
 Author: Paul Saxe
@@ -28,6 +28,18 @@ Requires-Dist: openpyxl
 Requires-Dist: pandas
 Requires-Dist: seamm
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 ===================
 SEAMM Table Plug-in
@@ -95,6 +107,11 @@ award OAC-1547580 and CHE-2136142.
 =======
 History
 =======
+2025.6.1 -- Enhancement to allow paths with directories.
+    * As in reading/writing structures, paths beginning with '/' are relative to the
+      root of the job, and relative paths are relative to the directory where the table
+      step is invoked.
+
 2023.11.10 -- Bugfix: title of edit dialog was wrong
 
 2023.10.30 -- Cleaned up output

{table_step-2023.11.10 → table_step-2025.6.1}/tests/test_flowcharts.py

@@ -4,7 +4,7 @@
 """Tests for `table_step` running full flowcharts."""
 from pathlib import Path
 import pytest
-from seamm import run_flowchart
+from seamm_exec import run
 
 test_dir = Path(__file__).resolve().parent
 
@@ -25,4 +25,4 @@ def test_flowchart(monkeypatch, tmp_path, flowchart):
         ],
     )
 
-    run_flowchart(wdir=str(tmp_path))
+    run(wdir=str(tmp_path))