Skip to content

Commit 227b344

Browse files
committed
3.10 and 3.11 good, still problems with 3.12
1 parent 7ba22f1 commit 227b344

4 files changed

Lines changed: 21 additions & 18 deletions

File tree

.github/workflows/conda-test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- uses: actions/checkout@v3
32-
- name: setup miniconda
32+
- name: setup environment with miniconda
3333
uses: conda-incubator/setup-miniconda@v3
3434
with:
3535
auto-update-conda: true
@@ -53,16 +53,12 @@ jobs:
5353
- name: install package
5454
run: |
5555
ls -lhp
56-
pip install .
56+
pip install .[test]
5757
5858
- name: get plannotate dbs
5959
run: |
6060
python -c "from plannotate.resources import download_databases; download_databases()"
6161
62-
- name: Install pytest
63-
run: |
64-
conda install pytest
65-
6662
- name: pytest
6763
run: |
6864
pytest --version

environment.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,8 @@ channels:
33
- conda-forge
44
- bioconda
55
dependencies:
6-
- altair=4.2.2
7-
- biopython>=1.78
86
- blast>=2.10.1
9-
- bokeh==2.4.3
10-
- click
117
- curl
128
- diamond>=2.0.13
13-
- numpy>1,<2
14-
- pandas>=1.3.5,<3.0
15-
- protobuf>=3.20.3
16-
- python>=3.10,<3.13
17-
- ripgrep>=13.0.0
18-
- streamlit>=1.22,<1.42
19-
- tabulate>=0.8.9
9+
- python>=3.12,<3.13
2010
- trnascan-se>=2.0.7

plannotate/streamlit_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def setup_page():
186186

187187
st.markdown(hide_streamlit_style, unsafe_allow_html=True)
188188

189-
st.image(rsc.get_image("pLannotate.png"), use_column_width="auto")
189+
st.image(rsc.get_image("pLannotate.png"), use_container_width="auto")
190190

191191
st.markdown(
192192
f'<div style="text-align: right; font-size: 0.9em"> {plannotate_version} </div>',

pyproject.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ requires-python = ">=3.10,<3.13"
77
authors = [
88
{name = "Matt McGuffie", email = "mmcguffi@gmail.com"},
99
]
10+
dependencies = [
11+
"altair==4.2.2",
12+
"biopython>=1.78",
13+
"bokeh==2.4.3",
14+
"click",
15+
"numpy==1.23; python_version < '3.12'",
16+
"numpy>=1.26; python_version >= '3.12'",
17+
"pandas>=1.3.5,<2; python_version == '3.10'",
18+
"pandas>=1.3.5,<3; python_version > '3.10'",
19+
"protobuf>=3.20.3",
20+
"ripgrep>=13",
21+
"streamlit>=1.36,<1.42",
22+
"tabulate>=0.8.9",
23+
]
24+
25+
[project.optional-dependencies]
26+
test = ["pytest", "pytest-cov"]
1027

1128
[project.scripts]
1229
plannotate = "plannotate.pLannotate:main"

0 commit comments

Comments
 (0)