Skip to content

Commit 3cce2dd

Browse files
authored
Candidate Release v1.7.0 (#42)
* bump version to v1.7.0 * use mamba-org/setup-micromamba for CI tests * remove deprecated pytest slow Marks * update Python Packaging CI to ubuntu-latest * fix CI quotes
1 parent b380964 commit 3cce2dd

File tree

8 files changed

+27
-41
lines changed

8 files changed

+27
-41
lines changed

.github/workflows/python-package-conda.yml

+22-17
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,33 @@ jobs:
1818
strategy:
1919
fail-fast: true
2020
matrix:
21-
os: ["ubuntu-latest", "macos-latest"]
22-
python-version: ["3.8"]
21+
os: ['ubuntu-latest', 'macos-latest']
22+
python-version: ['3.8']
2323
steps:
2424
- uses: actions/checkout@v2
25-
- uses: conda-incubator/setup-miniconda@v2
25+
- uses: mamba-org/setup-micromamba@v1
2626
with:
27-
auto-update-conda: false
28-
python-version: ${{ matrix.python-version }}
29-
miniconda-version: "latest"
30-
mamba-version: "*"
31-
channels: conda-forge,bioconda
32-
channel-priority: true
33-
auto-activate-base: false
34-
environment-file: environment.yml
35-
activate-environment: platon
27+
micromamba-version: 'latest'
28+
environment-name: 'platon'
29+
environment-file: 'environment.yml'
30+
create-args: python=${{ matrix.python-version }}
31+
condarc: |
32+
channels:
33+
- conda-forge
34+
- bioconda
35+
init-shell: bash
36+
cache-environment: true
37+
cache-downloads: true
38+
post-cleanup: 'all'
3639
- name: Install PyTest
37-
run: conda install pytest
38-
- name: Conda info
40+
run: micromamba install pytest
41+
shell: bash -l {0}
42+
- name: Mamba info
3943
run: |
40-
conda info
41-
conda list
42-
conda config --show
44+
micromamba info
45+
micromamba list
4346
printenv | sort
47+
shell: bash -l {0}
4448
- name: Run PyTest
4549
run: pytest
50+
shell: bash -l {0}

.github/workflows/pythonpackage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
17-
os: [ubuntu-18.04, ubuntu-20.04, macos-latest]
18-
python-version: [3.8, 3.9]
17+
os: ['ubuntu-latest', 'macos-latest']
18+
python-version: ['3.8', '3.10']
1919

2020
steps:
2121
- uses: actions/checkout@v2

CITATION.cff

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ authors:
2929
affiliation: Bioinformatics and Systems Biology, Justus Liebig University Giessen, Giessen, 35392, Germany
3030
title: "Platon: identification and characterization of bacterial plasmid contigs in short-read draft assemblies exploiting protein sequence-based replicon distribution scores"
3131
doi: "10.1099/mgen.0.000398"
32-
version: 1.6
32+
version: 1.7
3333
keywords:
3434
- bioinformatics
3535
- assembly

platon.cwl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ hints:
1717
SoftwareRequirement:
1818
packages:
1919
platon:
20-
version: [ "1.3.0" ]
20+
version: [ "1.7.0" ]
2121

2222
requirements:
2323
ResourceRequirement:

platon/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.6'
1+
__version__ = '1.7'

pytest.ini

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
[pytest]
22
addopts = --strict-markers
3-
markers =
4-
slow: mark tests as slow.

test/conftest.py

-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from _pytest.mark import Mark
2-
31

42
global FILES
53

@@ -10,14 +8,3 @@
108
'test.plasmid.fasta',
119
'test.tsv'
1210
]
13-
14-
15-
empty_mark = Mark('', [], {})
16-
17-
18-
def by_slow_marker(item):
19-
return item.get_closest_marker('slow', default=empty_mark)
20-
21-
22-
def pytest_collection_modifyitems(items):
23-
items.sort(key=by_slow_marker, reverse=False)

test/test_platon.py

-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from .conftest import FILES
77

88

9-
@pytest.mark.slow
109
def test_platon_db_parameter(tmpdir):
1110
# full test on draft assembly containing plasmid contigs
1211
proc = run(['bin/platon', '--db', 'test/db', '--output', tmpdir, '--prefix', 'test', 'test/data/mock-sample.fna'])
@@ -18,7 +17,6 @@ def test_platon_db_parameter(tmpdir):
1817
assert Path.exists(output_path)
1918

2019

21-
@pytest.mark.slow
2220
def test_platon_db_env(tmpdir):
2321
# full test on draft assembly containing plasmid contigs
2422

@@ -33,7 +31,6 @@ def test_platon_db_env(tmpdir):
3331
assert Path.exists(output_path)
3432

3533

36-
@pytest.mark.slow
3734
def test_platon_w_plasmids(tmpdir):
3835
# full test on draft assembly containing plasmid contigs
3936
proc = run(['bin/platon', '--db', 'test/db', '--output', tmpdir, '--prefix', 'test', 'test/data/draft-w-plasmids.fna'])
@@ -46,7 +43,6 @@ def test_platon_w_plasmids(tmpdir):
4643
assert output_path.stat().st_size > 0
4744

4845

49-
@pytest.mark.slow
5046
def test_platon_wo_plasmids(tmpdir):
5147
# full test on draft assembly containing no plasmid contigs
5248
proc = run(['bin/platon', '--db', 'test/db', '--output', tmpdir, '--prefix', 'test', 'test/data/draft-wo-plasmids.fna'])

0 commit comments

Comments
 (0)