From 696f51ceb4cff8ab4ed6d00117d3dfaed83e4c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Kubler?= <gregoire.kubler@proton.me>
Date: Tue, 14 May 2024 13:53:15 +0200
Subject: [PATCH] fix : cmake version, import path
---
aidge_core/__init__.py | 4 ++--
aidge_core/export/node_export.py | 6 +++---
pyproject.toml | 4 +---
setup.py | 1 -
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/aidge_core/__init__.py b/aidge_core/__init__.py
index 92dcc121d..989b6e269 100644
--- a/aidge_core/__init__.py
+++ b/aidge_core/__init__.py
@@ -8,5 +8,5 @@ http://www.eclipse.org/legal/epl-2.0.
SPDX-License-Identifier: EPL-2.0
"""
from . import * # import so generated by PyBind
-from aidge_core.export import ExportNode, generate_file, generate_str
-import aidge_core.utils
+from .export import ExportNode, generate_file, generate_str
+import utils
diff --git a/aidge_core/export/node_export.py b/aidge_core/export/node_export.py
index 477989b03..dd0189599 100644
--- a/aidge_core/export/node_export.py
+++ b/aidge_core/export/node_export.py
@@ -1,4 +1,4 @@
-import aidge_core
+from aidge_core import Node, Attributes
from abc import ABC, abstractmethod
@@ -8,7 +8,7 @@ class ExportNode(ABC):
"""
@abstractmethod
- def __init__(self, aidge_node: aidge_core.Node) -> None:
+ def __init__(self, aidge_node: Node) -> None:
"""Create ExportNode and retieve attirubtes from ``aidge_node``:
- name: aidge Node name
@@ -21,7 +21,7 @@ class ExportNode(ABC):
self.operator = aidge_node.get_operator()
self.name = self.node.name()
self.attributes = {} # Attributes are auto fetched from aidge operators
- if isinstance(self.operator, aidge_core.Attributes):
+ if isinstance(self.operator, Attributes):
for attr_name in self.operator.get_attrs_name():
self.attributes[attr_name] = self.operator.get_attr(attr_name)
diff --git a/pyproject.toml b/pyproject.toml
index 48259bfac..cfcb9a299 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ dynamic = ["version"] # defined in tool.setuptools_scm
requires = [
"setuptools>=64",
"setuptools_scm[toml]==7.1.0",
- "cmake>=3.29",
+ "cmake>=3.27.9",
"toml"
]
build-backend = "setuptools.build_meta"
@@ -369,5 +369,3 @@ ignored-argument-names = "_.*|^ignored_|^unused_"
# List of qualified module names which can have objects that can redefine
# builtins.
redefining-builtins-modules = ["six.moves", "past.builtins", "future.builtins", "builtins", "io"]
-
-
diff --git a/setup.py b/setup.py
index 11f07e689..3452f25fc 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
import sys
import os
-import sysconfig
import shutil
import pathlib
import multiprocessing
--
GitLab