Skip to content
Open
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
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ install_requires =
diskcache ~=5.0
future
httpx ~=0.24
importlib_resources
numpy >=1.13
optlang ~=1.8
pandas >=1.0,<3.0
Expand Down
4 changes: 2 additions & 2 deletions src/cobra/io/web/cobrapy_repository.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Provide functions for loading metabolic models from local package data."""

import importlib_resources
import importlib.resources

import cobra.data

Expand Down Expand Up @@ -50,7 +50,7 @@ def get_sbml(self, model_id: str) -> bytes:
A gzip-compressed, UTF-8 encoded SBML document.
"""
return (
importlib_resources.files(cobra.data)
importlib.resources.files(cobra.data)
.joinpath(f"{model_id}.xml.gz")
.read_bytes()
)
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""Define global fixtures."""

import importlib.resources
from pathlib import Path
from pickle import load as _load
from typing import List, Tuple

import importlib_resources
import pytest

import cobra
Expand All @@ -14,7 +14,7 @@


data_dir = Path(__file__).parent / "data"
cobra_data_dir = importlib_resources.files(cobra.data)
cobra_data_dir = importlib.resources.files(cobra.data)


def create_test_model(model_name: str = "salmonella") -> Model:
Expand Down
11 changes: 5 additions & 6 deletions tests/data/update_pickles.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
"""


import importlib.resources
from collections import OrderedDict
from json import dump as json_dump
from pickle import dump, load

import importlib_resources

import cobra
from cobra.io import (
load_matlab_model,
Expand Down Expand Up @@ -99,16 +98,16 @@
# output to various formats
with open("mini.pickle", "wb") as outfile:
dump(mini, outfile, protocol=2)
save_matlab_model(mini, importlib_resources.files(cobra.data).joinpath("mini.mat"))
save_matlab_model(mini, importlib.resources.files(cobra.data).joinpath("mini.mat"))
save_json_model(
mini, importlib_resources.files(cobra.data).joinpath("mini.json"), pretty=True
mini, importlib.resources.files(cobra.data).joinpath("mini.json"), pretty=True
)
save_yaml_model(mini, importlib_resources.files(cobra.data).joinpath("mini.yml"))
save_yaml_model(mini, importlib.resources.files(cobra.data).joinpath("mini.yml"))
write_sbml_model(mini, "mini_fbc2.xml")
write_sbml_model(mini, "mini_fbc2.xml.bz2")
write_sbml_model(mini, "mini_fbc2.xml.gz")
write_sbml_model(
mini, importlib_resources.files(cobra.data).joinpath("mini_cobra.xml")
mini, importlib.resources.files(cobra.data).joinpath("mini_cobra.xml")
)
raven = load_matlab_model("raven.mat")
with open("raven.pickle", "wb") as outfile:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_io/test_json.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Test functionalities of I/O in JSON format."""

import json
from importlib.resources import files
from pathlib import Path
from typing import Any, Callable, Dict, Union

import pytest
from importlib_resources import files

from cobra import Model
from cobra import io as cio
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ known_third_party =
diskcache
future
httpx
importlib_resources
libsbml
numpy
optlang
Expand Down