Skip to content

Commit 538e7da

Browse files
authored
Merge pull request #15 from moshi4/develop
Bump to v1.4.0
2 parents e67d670 + 7792820 commit 538e7da

File tree

7 files changed

+515
-525
lines changed

7 files changed

+515
-525
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: CI
22
on:
33
push:
4-
branches: [main]
4+
branches: [main, develop]
55
paths: ["src/**", "tests/**", ".github/workflows/ci.yml"]
66
pull_request:
7-
branches: [main]
7+
branches: [main, develop]
88
paths: ["src/**", "tests/**", ".github/workflows/ci.yml"]
99
workflow_dispatch:
1010

@@ -17,10 +17,10 @@ jobs:
1717
python-version: ["3.8", "3.9", "3.10", "3.11"]
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Setup Python ${{ matrix.python-version}}
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626

@@ -32,11 +32,11 @@ jobs:
3232
- name: Install Dependencies
3333
run: poetry install -n
3434

35-
- name: Run black format check
36-
run: poetry run black src tests --check --diff --verbose
37-
3835
- name: Run ruff lint check
39-
run: poetry run ruff .
36+
run: poetry run ruff check --diff
37+
38+
- name: Run ruff format check
39+
run: poetry run ruff format --check --diff
4040

4141
- name: Run pytest
42-
run: poetry run pytest tests --tb=line --cov=src --cov-report=xml --cov-report=term
42+
run: poetry run pytest

.github/workflows/publish_to_pypi.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

17-
- name: Setup Python 3.9
18-
uses: actions/setup-python@v4
17+
- name: Setup Python 3.12
18+
uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.9
20+
python-version: 3.12
2121

2222
- name: Install Poetry
2323
run: |

README.md

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,28 @@ Description of ANIclustermap's automated workflow.
4949

5050
### Options
5151

52-
-i I, --indir I Input genome fasta directory (*.fa|*.fna[.gz]|*.fasta)
53-
-o O, --outdir O Output directory
54-
-m , --mode ANI calculation mode ('fastani'[default]|'skani')
55-
-t , --thread_num Thread number parameter (Default: MaxThread - 1)
56-
--overwrite Overwrite previous ANI calculation result (Default: OFF)
57-
--fig_width Figure width (Default: 10)
58-
--fig_height Figure height (Default: 10)
59-
--dendrogram_ratio Dendrogram ratio to figsize (Default: 0.15)
60-
--cmap_colors cmap interpolation colors parameter (Default: 'lime,yellow,red')
61-
--cmap_gamma cmap gamma parameter (Default: 1.0)
62-
--cmap_ranges Range values (e.g. 80,90,95,100) for discrete cmap (Default: None)
63-
--cbar_pos Colorbar position (Default: (0.02, 0.8, 0.05, 0.18))
64-
--annotation Show ANI value annotation (Default: OFF)
65-
-v, --version Print version information
66-
-h, --help Show this help message and exit
52+
$ ANIclustermap --help
53+
usage: ANIclustermap -i [Genome fasta directory] -o [output directory]
54+
55+
Draw ANI(Average Nucleotide Identity) clustermap
56+
57+
optional arguments:
58+
-i I, --indir I Input genome fasta directory (*.fa|*.fna[.gz]|*.fasta)
59+
-o O, --outdir O Output directory
60+
-m , --mode ANI calculation mode ('fastani'[default]|'skani')
61+
-t , --thread_num Thread number parameter (Default: MaxThread - 1)
62+
--overwrite Overwrite previous ANI calculation result (Default: OFF)
63+
--fig_width Figure width (Default: 10)
64+
--fig_height Figure height (Default: 10)
65+
--dendrogram_ratio Dendrogram ratio to figsize (Default: 0.15)
66+
--cmap_colors cmap interpolation colors parameter (Default: 'lime,yellow,red')
67+
--cmap_gamma cmap gamma parameter (Default: 1.0)
68+
--cmap_ranges Range values (e.g. 80,90,95,100) for discrete cmap (Default: None)
69+
--cbar_pos Colorbar position (Default: (0.02, 0.8, 0.05, 0.18))
70+
--annotation Show ANI value annotation (Default: OFF)
71+
--annotation_fmt Annotation value format (Default: '.3g')
72+
-v, --version Print version information
73+
-h, --help Show this help message and exit
6774

6875
### Example Command
6976

0 commit comments

Comments
 (0)