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

Dependencies: Update requirement importlib-metadata~=4.13 #5963

Merged
merged 1 commit into from
Apr 13, 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 aiida/engine/processes/calcjobs/calcjob.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ def get_importer(cls, entry_point_name: str | None = None) -> CalcJobImporter:
if entry_point_name is None:
_, entry_point = get_entry_point_from_class(cls.__module__, cls.__name__)
if entry_point is not None:
entry_point_name = entry_point.name # type: ignore
entry_point_name = entry_point.name

assert entry_point_name is not None

Expand Down
2 changes: 1 addition & 1 deletion aiida/orm/groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __new__(cls, name, bases, namespace, **kwargs):
warnings.warn(message) # pylint: disable=no-member
else:
assert entry_point is not None
newcls._type_string = cast(str, entry_point.name) # type: ignore[attr-defined] # pylint: disable=protected-access
newcls._type_string = entry_point.name # type: ignore[attr-defined] # pylint: disable=protected-access

return newcls

Expand Down
8 changes: 2 additions & 6 deletions aiida/orm/nodes/process/calculation/calcjob.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,12 @@ def tools(self) -> 'CalculationTools':
entry_point = get_entry_point_from_string(entry_point_string)

try:
tools_class = load_entry_point(
'aiida.tools.calculations',
entry_point.name # type: ignore[attr-defined]
)
tools_class = load_entry_point('aiida.tools.calculations', entry_point.name)
self._tools = tools_class(self)
except exceptions.EntryPointError as exception:
self._tools = CalculationTools(self)
entry_point_name = entry_point.name # type: ignore[attr-defined]
self.logger.warning(
f'could not load the calculation tools entry point {entry_point_name}: {exception}'
f'could not load the calculation tools entry point {entry_point.name}: {exception}'
)

return self._tools
Expand Down
2 changes: 1 addition & 1 deletion aiida/plugins/entry_point.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def get_entry_point_string_from_class(class_module: str, class_name: str) -> Opt
group, entry_point = get_entry_point_from_class(class_module, class_name)

if group and entry_point:
return ENTRY_POINT_STRING_SEPARATOR.join([group, entry_point.name]) # type: ignore[attr-defined]
return ENTRY_POINT_STRING_SEPARATOR.join([group, entry_point.name])
return None


Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- jinja2~=3.0
- jsonschema~=3.0
- kiwipy[rmq]~=0.7.7
- importlib-metadata~=4.3
- importlib-metadata~=4.13
- importlib-resources~=5.0
- numpy~=1.19
- paramiko>=2.7.2,~=2.7
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies = [
"jinja2~=3.0",
"jsonschema~=3.0",
"kiwipy[rmq]~=0.7.7",
"importlib-metadata~=4.3",
"importlib-metadata~=4.13",
"importlib-resources~=5.0;python_version<'3.9'",
"numpy~=1.19",
"paramiko~=2.7,>=2.7.2",
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-py-3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ graphviz==0.19
greenlet==1.1.2
idna==3.3
imagesize==1.3.0
importlib-metadata==4.8.2
importlib-metadata==4.13.0
iniconfig==1.1.1
ipykernel==6.5.1
ipython==8.10.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-py-3.8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ graphviz==0.19
greenlet==1.1.2
idna==3.3
imagesize==1.3.0
importlib-metadata==4.8.2
importlib-metadata==4.13.0
importlib-resources==5.4.0
iniconfig==1.1.1
ipykernel==6.5.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-py-3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ graphviz==0.19
greenlet==1.1.2
idna==3.3
imagesize==1.3.0
importlib-metadata==4.8.2
importlib-metadata==4.13.0
iniconfig==1.1.1
ipykernel==6.5.1
ipython==8.10.0
Expand Down