Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[setup] add fallback version #4

Merged
merged 1 commit into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repos:
# for now don't force to change from %-operator to {}
args: [--keep-percent-format, --py3-plus, --py36-plus]
- repo: https://github.com/PyCQA/isort
rev: "5.7.0"
rev: "5.11.5"
hooks:
- id: isort
args: ["--profile", "black", "--filter-files"]
Expand Down
6 changes: 3 additions & 3 deletions fusesoc/capi2/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __new__(self, thing):


class StringWithUseFlags(str):
""" A parsed string with support for use flags. """
"""A parsed string with support for use flags."""

def __init__(self, string):
self.exprs = None
Expand All @@ -65,7 +65,7 @@ def parse(self, flags):


class String(str):
""" A plain (unparsed) string. """
"""A plain (unparsed) string."""

def parse(self, flags):
raise RuntimeError(
Expand Down Expand Up @@ -385,7 +385,7 @@ def get_generators(self):
return generators

def get_virtuals(self):
""" Get a list of "virtual" VLNVs provided by this core. """
"""Get a list of "virtual" VLNVs provided by this core."""
return self.virtual

def get_parameters(self, flags={}, ext_parameters={}):
Expand Down
10 changes: 5 additions & 5 deletions fusesoc/coremanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def _load_cores(self, library):
self.db.add(core, library)

def add_library(self, library):
""" Register a library """
"""Register a library"""
abspath = os.path.abspath(os.path.expanduser(library.location))
_library = self._lm.get_library(abspath, "location")
if _library:
Expand All @@ -301,7 +301,7 @@ def add_library(self, library):
self._lm.add_library(library)

def get_libraries(self):
""" Get all registered libraries """
"""Get all registered libraries"""
return self._lm.get_libraries()

def get_depends(self, core, flags):
Expand Down Expand Up @@ -358,17 +358,17 @@ def get_dependency_graph(self, core_vlnv, flags):
return graph

def get_cores(self):
""" Get a dict with all cores, indexed by the core name """
"""Get a dict with all cores, indexed by the core name"""
return {str(x.name): x for x in self.db.find()}

def get_core(self, name):
""" Get a core with a given name """
"""Get a core with a given name"""
c = self.db.find(name)
c.name.relation = "=="
return c

def get_generators(self):
""" Get a dict with all registered generators, indexed by name """
"""Get a dict with all registered generators, indexed by name"""
generators = {}
for core in self.db.find():
if hasattr(core, "get_generators"):
Expand Down
18 changes: 10 additions & 8 deletions fusesoc/edalizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def cores(self):

@property
def resolved_cores(self):
""" Get a list of all "used" cores after the dependency resolution """
"""Get a list of all "used" cores after the dependency resolution"""
try:
return self.core_manager.get_depends(self.toplevel, self.flags)
except DependencyError as e:
Expand All @@ -67,11 +67,11 @@ def resolved_cores(self):

@property
def discovered_cores(self):
""" Get a list of all cores found by fusesoc """
"""Get a list of all cores found by fusesoc"""
return self.core_manager.db.find()

def run(self):
""" Run all steps to create a EDAM file """
"""Run all steps to create a EDAM file"""

# Run the setup task on all cores (fetch and patch them as needed)
self.setup_cores()
Expand Down Expand Up @@ -110,20 +110,20 @@ def run(self):
return self.edam

def _core_flags(self, core):
""" Get flags for a specific core """
"""Get flags for a specific core"""

core_flags = self.flags.copy()
core_flags["is_toplevel"] = core.name == self.toplevel
return core_flags

def setup_cores(self):
""" Setup cores: fetch resources, patch them, etc. """
"""Setup cores: fetch resources, patch them, etc."""
for core in self.cores:
logger.info("Preparing " + str(core.name))
core.setup()

def extract_generators(self):
""" Get all registered generators from the cores """
"""Get all registered generators from the cores"""
generators = {}
for core in self.cores:
logger.debug("Searching for generators in " + str(core.name))
Expand Down Expand Up @@ -166,7 +166,7 @@ def _core_list_for_generator(self):
return out

def run_generators(self):
""" Run all generators """
"""Run all generators"""
generated_libraries = []
generated_cores = []
for core in self.cores:
Expand Down Expand Up @@ -242,7 +242,9 @@ def create_edam(self):
files_root = os.path.join(self.export_root, core.sanitized_name)
core.export(files_root, _flags)
elif core.is_generated:
files_root = os.path.join(self.work_root, "generated", core.sanitized_name)
files_root = os.path.join(
self.work_root, "generated", core.sanitized_name
)
core.export(files_root, _flags)
else:
files_root = core.files_root
Expand Down
4 changes: 1 addition & 3 deletions fusesoc/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ def dep_graph(cm, args):

# Remove the dot file if the conversion went well.
os.unlink(dot_filepath)
print(
"Successfully written dependency graph to {}.".format(converted_output_filepath)
)
print(f"Successfully written dependency graph to {converted_output_filepath}.")


def list_paths(cm, args):
Expand Down
2 changes: 1 addition & 1 deletion fusesoc/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@ def depgraph_to_dot(core_graph):
s = "digraph dependencies {\n"
for core, deps in core_graph.items():
for dep in deps:
s += '"{}"->"{}"\n'.format(core, dep)
s += f'"{core}"->"{dep}"\n'
s += "}\n"
return s
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def read(fname):
use_scm_version={
"relative_to": __file__,
"write_to": "fusesoc/version.py",
"fallback_version": "0.4.dev0",
},
author="Olof Kindgren",
author_email="olof.kindgren@gmail.com",
Expand Down
2 changes: 0 additions & 2 deletions tests/test_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@


def test_coregen_provider():

cache_root = tempfile.mkdtemp("coregen_")
core = Core(os.path.join(cores_root, "misc", "coregencore.core"), cache_root)

Expand Down Expand Up @@ -72,7 +71,6 @@ def test_github_provider():


def test_logicore_provider():

cache_root = tempfile.mkdtemp("logicore_")
core = Core(os.path.join(cores_root, "misc", "logicorecore.core"), cache_root)

Expand Down