From 608904325aa6c53cb36c97b1f66df24ccdb74bea Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Sun, 14 Apr 2024 08:52:19 +1000 Subject: [PATCH] Fix #4525. Fix #4546. Specify dependencies for ifcopenshell and ifcpatch. No longer optional for a better first experience. They aren't huge deps. --- src/ifcopenshell-python/pyproject.toml | 8 +++++--- src/ifcpatch/pyproject.toml | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ifcopenshell-python/pyproject.toml b/src/ifcopenshell-python/pyproject.toml index 5cdb5a275c..89a55a2c69 100644 --- a/src/ifcopenshell-python/pyproject.toml +++ b/src/ifcopenshell-python/pyproject.toml @@ -1,6 +1,7 @@ [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" + [project] name = "ifcopenshell" version = "0.7.0.999999" @@ -14,15 +15,16 @@ classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)", ] -[project.optional-dependencies] -geometry = ["mathutils", "shapely", "numpy"] -date = ["isodate", "dateutil"] +dependencies = ["mathutils", "shapely", "numpy", "isodate", "dateutil", "lark"] + [project.urls] "Homepage" = "http://ifcopenshell.org" "Bug Tracker" = "https://github.com/ifcopenshell/ifcopenshell/issues" + [tool.setuptools.packages.find] where = ["dist"] include = ["ifcopenshell*"] + [tool.setuptools.package-data] ifcopenshell = ["*.pyd", "*.so", "*.json"] "ifcopenshell.util" = ["*.json", "schema/*.ifc"] diff --git a/src/ifcpatch/pyproject.toml b/src/ifcpatch/pyproject.toml index 2cb7329226..7607cf6a00 100644 --- a/src/ifcpatch/pyproject.toml +++ b/src/ifcpatch/pyproject.toml @@ -15,9 +15,7 @@ classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)", ] -dependencies = [ - "ifcopenshell", -] +dependencies = ["ifcopenshell", "toposort", "numpy"] [project.urls] Homepage = "http://ifcopenshell.org"