Skip to content

Commit 92ded6d

Browse files
authored
Merge pull request #39 from j-andrews7/0.4.1
v0.4.1 changes
2 parents 0899b29 + 67f2afc commit 92ded6d

File tree

7 files changed

+51
-14
lines changed

7 files changed

+51
-14
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ The database file uses same format as for the standard `strprofiler` command.
253253
Then create a requirements.txt file in the same directory with `strprofiler` listed:
254254
255255
```
256-
strprofiler>=0.4.0
256+
strprofiler>=0.4.1
257257
```
258258
259259
This app can then be deployed to any of the above endpoints as [one would with any other Shiny app](https://shiny.posit.co/py/docs/deploy.html), e.g.:
@@ -279,7 +279,7 @@ It is released with zero warranty for any purpose and the authors retain no liab
279279
280280
If you use **STRprofiler** in your research, please cite the DOI:
281281
282-
Jared Andrews, Mike Lloyd, & Sam Culley. (2024). j-andrews7/strprofiler: v0.4.0 (v0.4.0). Zenodo. https://doi.org/10.5281/zenodo.7348386
282+
Jared Andrews, Mike Lloyd, & Sam Culley. (2024). j-andrews7/strprofiler: v0.4.1 (v0.4.1). Zenodo. https://doi.org/10.5281/zenodo.7348386
283283
284284
If you use the `clastr` command or functionality from the Shiny application, please cite the Cellosaurus and CLASTR publications:
285285

Diff for: app.py

-3
This file was deleted.

Diff for: pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "strprofiler"
3-
version = "0.4.0"
3+
version = "0.4.1"
44
description = "A python package, CLI tool, and Shiny application to compare short tandem repeat (STR) profiles."
55
authors = ["Jared Andrews <[email protected]>",
66
"Mike Lloyd <[email protected]>"]

Diff for: strprofiler/shiny_app/shiny_app.py

+22-1
Original file line numberDiff line numberDiff line change
@@ -487,10 +487,31 @@ def create_app(db=None):
487487
),
488488
),
489489
ui.nav_spacer(),
490+
ui.nav_control(
491+
ui.a(
492+
ui.p("Docs"),
493+
href="https://strprofiler.readthedocs.io/en/latest/",
494+
target="_blank",
495+
),
496+
),
497+
ui.nav_control(
498+
ui.a(
499+
ui.p("Package & CLI"),
500+
href="https://pypi.org/project/strprofiler/",
501+
target="_blank",
502+
),
503+
),
504+
ui.nav_control(
505+
ui.a(
506+
ui.span(ui.p("Bug Reports")),
507+
href="https://github.com/j-andrews7/strprofiler/issues/",
508+
target="_blank",
509+
),
510+
),
490511
ui.nav_control(
491512
ui.a(
492513
icon_svg("github", width="30px"),
493-
href="https://github.com/j-andrews7/strprofiler",
514+
href="https://github.com/j-andrews7/strprofiler/",
494515
target="_blank",
495516
),
496517
),

Diff for: strprofiler/shiny_app/www/help.html

+8-1
Original file line numberDiff line numberDiff line change
@@ -1775,13 +1775,20 @@ <h2>Batch Query Specific</h2>
17751775
<hr />
17761776
</div>
17771777
</div>
1778+
<div id="python-package-cli" class="section level1">
1779+
<h1>Python Package &amp; CLI</h1>
1780+
<p><strong>STRprofiler</strong> also has a command line interface
1781+
through a python package available from <a href="https://pypi.org/project/strprofiler/">PyPI</a>. The full docs are
1782+
available on <a href="https://strprofiler.readthedocs.io/en/latest/">ReadTheDocs</a>.</p>
1783+
<hr />
1784+
</div>
17781785
<div id="references" class="section level1">
17791786
<h1>References</h1>
17801787
<p><code>STRprofiler</code> is provided under the MIT license. If you
17811788
use this app in your research please cite:<br />
17821789
Jared Andrews, Mike Lloyd, &amp; Sam Culley. (2024).
17831790
<a href="https://github.com/j-andrews7/strprofiler" target="_blank">j-andrews7/strprofiler</a>:
1784-
v0.4.0. Zenodo.
1791+
v0.4.1. Zenodo.
17851792
<a href="https://doi.org/10.5281/zenodo.10544686" target="_blank">https://doi.org/10.5281/zenodo.10544686</a></p>
17861793
<p>Bairoch A. (2018) The Cellosaurus, a cell line knowledge resource.
17871794
Journal of Biomolecular Techniques. 29:25-38. DOI:

Diff for: strprofiler/shiny_app/www/help.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,17 @@ Users can upload custom database files. The files must be in CSV format. A 'Samp
134134

135135
---
136136

137+
# Python Package & CLI
138+
139+
**STRprofiler** also has a command line interface through a python package available from [PyPI](https://pypi.org/project/strprofiler/).
140+
The full docs are available on [ReadTheDocs](https://strprofiler.readthedocs.io/en/latest/).
141+
142+
---
143+
137144
# References
138145

139146
`STRprofiler` is provided under the MIT license. If you use this app in your research please cite:
140-
Jared Andrews, Mike Lloyd, & Sam Culley. (2024). <a href="https://github.com/j-andrews7/strprofiler" target="_blank">j-andrews7/strprofiler</a>: v0.4.0. Zenodo. <a href="https://doi.org/10.5281/zenodo.10544686" target="_blank">https://doi.org/10.5281/zenodo.10544686</a>
147+
Jared Andrews, Mike Lloyd, & Sam Culley. (2024). <a href="https://github.com/j-andrews7/strprofiler" target="_blank">j-andrews7/strprofiler</a>: v0.4.1. Zenodo. <a href="https://doi.org/10.5281/zenodo.10544686" target="_blank">https://doi.org/10.5281/zenodo.10544686</a>
141148

142149
Bairoch A. (2018) The Cellosaurus, a cell line knowledge resource. Journal of Biomolecular Techniques. 29:25-38. DOI: 10.7171/jbt.18-2902-002; PMID: 29805321
143150

Diff for: strprofiler/utils.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,16 @@ def make_summary(
406406
+ ": "
407407
+ samp_df["tanabe_score"].round(decimals=2).astype(str).iloc[1]
408408
)
409-
next_hit = (
410-
samp_df["Sample"].iloc[2]
411-
+ ": "
412-
+ samp_df["tanabe_score"].round(decimals=2).astype(str).iloc[2]
413-
)
409+
410+
# Check if there is a next hit and include it if so.
411+
if len(samp_df) > 2:
412+
next_hit = (
413+
samp_df["Sample"].iloc[2]
414+
+ ": "
415+
+ samp_df["tanabe_score"].round(decimals=2).astype(str).iloc[2]
416+
)
417+
else:
418+
next_hit = ""
414419

415420
masters_q_match = samp_df[samp_df["masters_query_score"] >= mas_q_threshold]
416421
masters_q_out = (

0 commit comments

Comments
 (0)