Prevent unwanted directories to be installed as Python packages (#1301)

* Prevent unwanted directories to be installed as Python packages * Add missing __init__.py * Try using find_namespace_packages() with include filter instead * Try including DMF data after changing root dir name to be more explicit * Actually rename DMF data directory
IDAES · Dec 13, 2023 · 75a784e · 75a784e
1 parent 87ee4c5
commit 75a784e
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 3 deletions.
diff --git a/data/config.yaml → dmf_data/config.yaml b/data/config.yaml → dmf_data/config.yaml
diff --git a/...3b0763c5424b8a056f5b0821dc32/pitzer_4.csv → ...3b0763c5424b8a056f5b0821dc32/pitzer_4.csv b/...3b0763c5424b8a056f5b0821dc32/pitzer_4.csv → ...3b0763c5424b8a056f5b0821dc32/pitzer_4.csv
diff --git a/...7ea39cd04decae3a13cb89397255/pitzer_5.csv → ...7ea39cd04decae3a13cb89397255/pitzer_5.csv b/...7ea39cd04decae3a13cb89397255/pitzer_5.csv → ...7ea39cd04decae3a13cb89397255/pitzer_5.csv
diff --git a/...76e4eb33410fa40cbdd155e57d60/pitzer_3.csv → ...76e4eb33410fa40cbdd155e57d60/pitzer_3.csv b/...76e4eb33410fa40cbdd155e57d60/pitzer_3.csv → ...76e4eb33410fa40cbdd155e57d60/pitzer_3.csv
diff --git a/...7bd211c4a5683f6f389f9a762df/pitzer_13.csv → ...7bd211c4a5683f6f389f9a762df/pitzer_13.csv b/...7bd211c4a5683f6f389f9a762df/pitzer_13.csv → ...7bd211c4a5683f6f389f9a762df/pitzer_13.csv
diff --git a/...4089045464db1afad7f5cd384c7/pitzer_14.csv → ...4089045464db1afad7f5cd384c7/pitzer_14.csv b/...4089045464db1afad7f5cd384c7/pitzer_14.csv → ...4089045464db1afad7f5cd384c7/pitzer_14.csv
diff --git a/...319d0fd4b328b4cf53af35301f7/pitzer_16.csv → ...319d0fd4b328b4cf53af35301f7/pitzer_16.csv b/...319d0fd4b328b4cf53af35301f7/pitzer_16.csv → ...319d0fd4b328b4cf53af35301f7/pitzer_16.csv
diff --git a/...2419c7c243059dea2fbac2a991a7/pitzer_2.csv → ...2419c7c243059dea2fbac2a991a7/pitzer_2.csv b/...2419c7c243059dea2fbac2a991a7/pitzer_2.csv → ...2419c7c243059dea2fbac2a991a7/pitzer_2.csv
diff --git a/...4b2994646c1bb5c188aa8f318af/pitzer_10.csv → ...4b2994646c1bb5c188aa8f318af/pitzer_10.csv b/...4b2994646c1bb5c188aa8f318af/pitzer_10.csv → ...4b2994646c1bb5c188aa8f318af/pitzer_10.csv
diff --git a/...1700e67446887efccafd43015da/pitzer_12.csv → ...1700e67446887efccafd43015da/pitzer_12.csv b/...1700e67446887efccafd43015da/pitzer_12.csv → ...1700e67446887efccafd43015da/pitzer_12.csv
diff --git a/...3a7a54fcf99d3a8bfe925ab19/Pitzer_1984.pdf → ...3a7a54fcf99d3a8bfe925ab19/Pitzer_1984.pdf b/...3a7a54fcf99d3a8bfe925ab19/Pitzer_1984.pdf → ...3a7a54fcf99d3a8bfe925ab19/Pitzer_1984.pdf
diff --git a/...8a43c8134ba2b11235b0fb475a68/pitzer_1.csv → ...8a43c8134ba2b11235b0fb475a68/pitzer_1.csv b/...8a43c8134ba2b11235b0fb475a68/pitzer_1.csv → ...8a43c8134ba2b11235b0fb475a68/pitzer_1.csv
diff --git a/...f86d2cf3439a9dfbe71f5ca468c4/pitzer_8.csv → ...f86d2cf3439a9dfbe71f5ca468c4/pitzer_8.csv b/...f86d2cf3439a9dfbe71f5ca468c4/pitzer_8.csv → ...f86d2cf3439a9dfbe71f5ca468c4/pitzer_8.csv
diff --git a/...9646005e45af98e94990648eef5f/pitzer_9.csv → ...9646005e45af98e94990648eef5f/pitzer_9.csv b/...9646005e45af98e94990648eef5f/pitzer_9.csv → ...9646005e45af98e94990648eef5f/pitzer_9.csv
diff --git a/...a0a466a24a4a9f5f7c9ef6809355/pitzer_6.csv → ...a0a466a24a4a9f5f7c9ef6809355/pitzer_6.csv b/...a0a466a24a4a9f5f7c9ef6809355/pitzer_6.csv → ...a0a466a24a4a9f5f7c9ef6809355/pitzer_6.csv
diff --git a/...e45d9e54011ad7f45506cd943d9/pitzer_17.csv → ...e45d9e54011ad7f45506cd943d9/pitzer_17.csv b/...e45d9e54011ad7f45506cd943d9/pitzer_17.csv → ...e45d9e54011ad7f45506cd943d9/pitzer_17.csv
diff --git a/...996b34d24048891713a8d3a1be71/pitzer_7.csv → ...996b34d24048891713a8d3a1be71/pitzer_7.csv b/...996b34d24048891713a8d3a1be71/pitzer_7.csv → ...996b34d24048891713a8d3a1be71/pitzer_7.csv
diff --git a/...39e4707443a9768f81a84c3ba85/pitzer_11.csv → ...39e4707443a9768f81a84c3ba85/pitzer_11.csv b/...39e4707443a9768f81a84c3ba85/pitzer_11.csv → ...39e4707443a9768f81a84c3ba85/pitzer_11.csv
diff --git a/...c9ba1f54e3a85f0f3e383951fc3/pitzer_15.csv → ...c9ba1f54e3a85f0f3e383951fc3/pitzer_15.csv b/...c9ba1f54e3a85f0f3e383951fc3/pitzer_15.csv → ...c9ba1f54e3a85f0f3e383951fc3/pitzer_15.csv
diff --git a/data/resourcedb.json → dmf_data/resourcedb.json b/data/resourcedb.json → dmf_data/resourcedb.json
diff --git a/idaes/core/dmf/datasets.py b/idaes/core/dmf/datasets.py
@@ -39,7 +39,7 @@
 NAME = "idaes-pse"
 
 # Keep this the same as constant DMF_DATA_ROOT in setup.py
-DMF_DATA_ROOT = "data"
+DMF_DATA_ROOT = "dmf_data"
 
 _log = logging.getLogger(__name__)
 

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@ def rglob(path, glob):
 
 
 # For included DMF data
-DMF_DATA_ROOT = "data"
+DMF_DATA_ROOT = "dmf_data"
 
 
 def dmf_data_files(root: str = DMF_DATA_ROOT) -> List[Tuple[str, List[str]]]:
@@ -123,7 +123,12 @@ def __getitem__(self, key):
     zip_safe=False,
     name=NAME,
     version=VERSION,
-    packages=find_namespace_packages(),
+    packages=find_namespace_packages(
+        include=[
+            "idaes*",
+            "dmf_data*",
+        ]
+    ),
     # Put abstract (non-versioned) deps here.
     # Concrete dependencies go in requirements[-dev].txt
     install_requires=[