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

Update GenomIO to use ensembl-utils v0.3.0 #388

Merged
merged 1 commit into from
Jun 28, 2024
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 conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# limitations under the License.
"""Global pytest configuration for Ensembl GenomIO tests."""

pytest_plugins = ("ensembl.plugins.pytest_unittest",)
pytest_plugins = ("ensembl.utils.plugin",)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies = [
"biopython == 1.81",
"ensembl-hive @ git+https://github.com/Ensembl/ensembl-hive.git",
"ensembl-py @ git+https://github.com/Ensembl/ensembl-py.git", # minimum v2.0.0
"ensembl-utils >= 0.2.0",
"ensembl-utils >= 0.3.0",
"jsonschema >= 4.6.0",
"intervaltree >= 3.1.0",
"mysql-connector-python >= 8.0.29",
Expand Down
2 changes: 1 addition & 1 deletion src/python/ensembl/io/genomio/annotation/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
from sqlalchemy import and_

from ensembl.core.models import Gene, Transcript, ObjectXref, Xref
from ensembl.database import DBConnection
from ensembl.io.genomio.utils import get_json
from ensembl.utils.argparse import ArgumentParser
from ensembl.utils.database import DBConnection
from ensembl.utils.logging import init_logging_with_args


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
from sqlalchemy import create_engine, select
from sqlalchemy.orm import Session

from ensembl.database import DBConnection
from ensembl.core.models import Meta
from ensembl.utils.database import DBConnection


_DB_PATTERN_RELEASE = re.compile(r".+_(?:core|otherfeatures|variation)_(?P<release>\d+)_\d+_\d+")
Expand Down
4 changes: 2 additions & 2 deletions src/python/ensembl/io/genomio/genome_stats/dump.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
from sqlalchemy.orm import Session

from ensembl.core.models import SeqRegionAttrib, AttribType, Gene, Transcript
from ensembl.database import URL
from ensembl.io.genomio.database import DBConnectionLite
from ensembl.utils.argparse import ArgumentParser
from ensembl.utils.database import StrURL
from ensembl.utils.logging import init_logging_with_args


Expand Down Expand Up @@ -129,7 +129,7 @@ def get_genome_stats(self) -> Dict[str, Any]:
return genome_stats


def dump_genome_stats(url: URL) -> Dict[str, Any]:
def dump_genome_stats(url: StrURL) -> Dict[str, Any]:
"""Returns JSON object containing the genome stats (assembly and annotation) of the given core database.

Args:
Expand Down
2 changes: 1 addition & 1 deletion src/python/ensembl/io/genomio/seq_region/rename.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
from sqlalchemy.orm import Session

from ensembl.core.models import SeqRegion, SeqRegionSynonym, SeqRegionAttrib
from ensembl.database import DBConnection
from ensembl.utils.argparse import ArgumentParser
from ensembl.utils.database import DBConnection
from ensembl.utils.logging import init_logging_with_args


Expand Down