From 2b71b33c82a97989e824a603decfad6dce1622f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Dukai?= Date: Wed, 14 Jun 2023 02:26:28 +0200 Subject: [PATCH] Don't use importlib for version --- src/ifccityjson/ifccityjson/cityjson2ifc/__init__.py | 3 +-- src/ifccityjson/ifccityjson/cityjson2ifc/cityjson2ifc.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ifccityjson/ifccityjson/cityjson2ifc/__init__.py b/src/ifccityjson/ifccityjson/cityjson2ifc/__init__.py index ccae140c39..71bcf23e7a 100644 --- a/src/ifccityjson/ifccityjson/cityjson2ifc/__init__.py +++ b/src/ifccityjson/ifccityjson/cityjson2ifc/__init__.py @@ -1,4 +1,3 @@ - # ifccityjson - Python CityJSON to IFC converter # Copyright (C) 2021 Laurens J.N. Oostwegel # @@ -16,5 +15,5 @@ # # You should have received a copy of the GNU Lesser General Public License # along with ifccityjson. If not, see . - +__version__ = "0.1.0" from .cityjson2ifc import * \ No newline at end of file diff --git a/src/ifccityjson/ifccityjson/cityjson2ifc/cityjson2ifc.py b/src/ifccityjson/ifccityjson/cityjson2ifc/cityjson2ifc.py index 7e5daea1a5..80d275ee25 100644 --- a/src/ifccityjson/ifccityjson/cityjson2ifc/cityjson2ifc.py +++ b/src/ifccityjson/ifccityjson/cityjson2ifc/cityjson2ifc.py @@ -18,12 +18,12 @@ # along with ifccityjson. If not, see . import os -from importlib.metadata import version as pkg_version import ifcopenshell import ifcopenshell.api from datetime import datetime from .geometry import GeometryIO +from . import __version__ JSON_TO_IFC = { "Building": ["IfcBuilding"], @@ -197,7 +197,7 @@ class Cityjson2ifc: "IfcOpenShell, an open source (LGPL) software library that helps users and software developers to work with the IFC file format.", ) p_o = self.IFC_model.createIfcPersonAndOrganization(person, organization) - application = self.IFC_model.createIfcApplication(organization, pkg_version("ifccityjson"), "ifccityjson", "ifccityjson") + application = self.IFC_model.createIfcApplication(organization, __version__, "ifccityjson", "ifccityjson") timestamp = int(datetime.now().timestamp()) ownerHistory = self.IFC_model.createIfcOwnerHistory(p_o, application, "READWRITE", None, None, None, None, timestamp)