Skip to content

Commit fc46f45

Browse files
committed
remove amdirt capitalization
1 parent e8c7e23 commit fc46f45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+159
-159
lines changed

.github/workflows/ci_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: AMDirT-CI
1+
name: amdirt-CI
22

33
on: [push, pull_request]
44

.github/workflows/publish_pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
- name: Setup Python
1414
uses: actions/setup-python@v3
1515
with:
16-
python-version: "3.9"
17-
- name: Build AMDirT
16+
python-version: "3.12"
17+
- name: Build amdirt
1818
run: |
1919
pip install wheel
2020
python setup.py sdist bdist_wheel

AMDirT/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.6.3"
1+
__version__ = "1.6.4"

AMDirT/assets/tables.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"ancientmetagenome-environmental": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-environmental/samples/ancientmetagenome-environmental_samples.tsv",
44
"ancientmetagenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-hostassociated/samples/ancientmetagenome-hostassociated_samples.tsv",
55
"ancientsinglegenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientsinglegenome-hostassociated/samples/ancientsinglegenome-hostassociated_samples.tsv",
6-
"test": "https://raw.githubusercontent.com/SPAAM-community/AMDirT/dev/tests/data/valid.tsv"
6+
"test": "https://raw.githubusercontent.com/SPAAM-community/amdirt/dev/tests/data/valid.tsv"
77
},
88
"samples_schema": {
99
"ancientmetagenome-environmental": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-environmental/samples/ancientmetagenome-environmental_samples_schema.json",
1010
"ancientmetagenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-hostassociated/samples/ancientmetagenome-hostassociated_samples_schema.json",
1111
"ancientsinglegenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientsinglegenome-hostassociated/samples/ancientsinglegenome-hostassociated_samples_schema.json",
12-
"test": "https://raw.githubusercontent.com/SPAAM-community/AMDirT/dev/tests/data/schema.json"
12+
"test": "https://raw.githubusercontent.com/SPAAM-community/amdirt/dev/tests/data/schema.json"
1313
},
1414
"libraries": {
1515
"ancientmetagenome-environmental": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-environmental/libraries/ancientmetagenome-environmental_libraries.tsv",
1616
"ancientmetagenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-hostassociated/libraries/ancientmetagenome-hostassociated_libraries.tsv",
1717
"ancientsinglegenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientsinglegenome-hostassociated/libraries/ancientsinglegenome-hostassociated_libraries.tsv",
18-
"test": "https://raw.githubusercontent.com/SPAAM-community/AMDirT/dev/tests/data/valid_libaries.tsv"
18+
"test": "https://raw.githubusercontent.com/SPAAM-community/amdirt/dev/tests/data/valid_libaries.tsv"
1919
},
2020
"libraries_schema": {
2121
"ancientmetagenome-environmental": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-environmental/libraries/ancientmetagenome-environmental_libraries_schema.json",
2222
"ancientmetagenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientmetagenome-hostassociated/libraries/ancientmetagenome-hostassociated_libraries_schema.json",
2323
"ancientsinglegenome-hostassociated": "https://raw.githubusercontent.com/SPAAM-community/AncientMetagenomeDir/master/ancientsinglegenome-hostassociated/libraries/ancientsinglegenome-hostassociated_libraries_schema.json",
24-
"test": "https://raw.githubusercontent.com/SPAAM-community/AMDirT/dev/tests/data/libraries_schema.json"
24+
"test": "https://raw.githubusercontent.com/SPAAM-community/amdirt/dev/tests/data/libraries_schema.json"
2525
}
2626
}

AMDirT/autofill/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from AMDirT.validate.domain import DatasetValidator
2-
from AMDirT.core import get_json_path, logger
3-
from AMDirT.core.ena import ENAPortalAPI
4-
from AMDirT.validate.exceptions import NetworkError
1+
from amdirt.validate.domain import DatasetValidator
2+
from amdirt.core import get_json_path, logger
3+
from amdirt.core.ena import ENAPortalAPI
4+
from amdirt.validate.exceptions import NetworkError
55
import json
66

77
import sys

AMDirT/cli.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import click
2-
from AMDirT import __version__
3-
4-
from AMDirT.validate import run_validation
5-
from AMDirT.viewer import run_app
6-
from AMDirT.convert import run_convert
7-
from AMDirT.core import get_json_path, get_amdir_tags, get_latest_tag
8-
from AMDirT.autofill import run_autofill
9-
from AMDirT.merge import merge_new_df
10-
from AMDirT.download import download as download_amdir
2+
from amdirt import __version__
3+
4+
from amdirt.validate import run_validation
5+
from amdirt.viewer import run_app
6+
from amdirt.convert import run_convert
7+
from amdirt.core import get_json_path, get_amdir_tags, get_latest_tag
8+
from amdirt.autofill import run_autofill
9+
from amdirt.merge import merge_new_df
10+
from amdirt.download import download as download_amdir
1111
from json import load
1212

1313

@@ -49,9 +49,9 @@ def get_table_list():
4949
@click.option("--verbose", is_flag=True, help="Verbose mode")
5050
def cli(ctx, verbose, no_args_is_help=True, **kwargs):
5151
"""\b
52-
AMDirT: Performs validity check of AncientMetagenomeDir datasets
53-
Authors: AMDirT development team and the SPAAM community
54-
Homepage & Documentation: https://github.com/SPAAM-community/AMDirT
52+
amdirt: Performs validity check of AncientMetagenomeDir datasets
53+
Authors: amdirt development team and the SPAAM community
54+
Homepage & Documentation: https://github.com/SPAAM-community/amdirt
5555
\b
5656
"""
5757
ctx.ensure_object(dict)
@@ -330,7 +330,7 @@ def merge(ctx, no_args_is_help=True, **kwargs):
330330
)
331331
def download(no_args_is_help=True, **kwargs):
332332
"""\b
333-
Download a table from the AMDirT repository
333+
Download a table from the amdirt repository
334334
"""
335335
download_amdir(**kwargs)
336336

AMDirT/convert/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from sys import path
22
import os
3-
from AMDirT.core import (
3+
from amdirt.core import (
44
prepare_accession_table,
55
prepare_bibtex_file,
66
prepare_eager_table,
@@ -12,10 +12,10 @@
1212
get_remote_resources,
1313
get_json_path,
1414
)
15-
from AMDirT.validate import AMDirValidator
16-
from AMDirT.validate.exceptions import DatasetValidationError
15+
from amdirt.validate import AMDirValidator
16+
from amdirt.validate.exceptions import DatasetValidationError
1717
from json import load
18-
from AMDirT.core import logger
18+
from amdirt.core import logger
1919
import pandas as pd
2020
import warnings
2121

@@ -38,7 +38,7 @@ def run_convert(
3838
mag=False,
3939
verbose=False,
4040
):
41-
"""Run the AMDirT conversion application to input samplesheet tables for different pipelines
41+
"""Run the amdirt conversion application to input samplesheet tables for different pipelines
4242
4343
Args:
4444
samples (str): Path to AncientMetagenomeDir filtered samples tsv file

AMDirT/core/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
colorlog.ColoredFormatter("%(log_color)s%(name)s [%(levelname)s]: %(message)s")
2323
)
2424

25-
logger = colorlog.getLogger("AMDirT")
25+
logger = colorlog.getLogger("amdirt")
2626
logger.addHandler(handler)
2727
logger.propagate = False
2828

@@ -44,7 +44,7 @@ def monkeypatch_get_storage_manager():
4444

4545

4646
def get_json_path():
47-
path = get_module_dir("AMDirT.assets").joinpath("tables.json")
47+
path = get_module_dir("amdirt.assets").joinpath("tables.json")
4848
return path
4949

5050

AMDirT/core/ena.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import requests
2-
from AMDirT.core import logger
2+
from amdirt.core import logger
33
import os
44
from typing import List, Dict
55

AMDirT/download/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from AMDirT.core import (
1+
from amdirt.core import (
22
logger,
33
get_amdir_tags,
44
get_remote_resources,
@@ -9,7 +9,7 @@
99

1010
def download(table: str, table_type: str, release: str, output: str = ".") -> str:
1111
"""
12-
Download a table from the AMDirT repository.
12+
Download a table from the amdirt repository.
1313
1414
Parameters
1515
----------

0 commit comments

Comments
 (0)