Skip to content

Commit 4cfee59

Browse files
committed
update to v0.3.8 to fix adjustText usage
1 parent c6feefc commit 4cfee59

9 files changed

Lines changed: 144 additions & 140 deletions

File tree

AppImageBuilder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AppDir:
1111
app_info:
1212
id: org.appimage-crafters.trackplot
1313
name: trackplot
14-
version: 0.3.7
14+
version: 0.3.8
1515
# Set the python executable as entry point
1616
exec: "bin/python3"
1717
# Set the application main script path as argument. Use '$@' to forward CLI parameters

Pipfile

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,67 @@ verify_ssl = false
44
name = "pip_conf_index_global"
55

66
[packages]
7-
adjusttext = "==0.7.3"
8-
asciitree = "==0.3.3"
9-
blinker = "==1.7.0"
10-
blosc2 = "==2.0.0"
11-
cairocffi = "==1.6.1"
12-
certifi = "==2023.11.17"
13-
cffi = "==1.16.0"
14-
charset-normalizer = "==3.3.2"
15-
click-option-group = "==0.5.6"
16-
click = "==8.1.7"
17-
colorama = "==0.4.6"
18-
contourpy = "==1.1.1"
19-
cooler = "==0.9.3"
20-
cycler = "==0.12.1"
21-
cython = "==3.0.5"
22-
cytoolz = "==0.12.2"
23-
dill = "==0.3.7"
24-
filetype = "==1.2.0"
25-
flask = "==2.3.3"
26-
fonttools = "==4.45.1"
27-
h5py = "==3.10.0"
28-
hicmatrix = "==15"
7+
adjusttext = ">=0.7.3"
8+
asciitree = ">=0.3.3"
9+
blinker = ">=1.7.0"
10+
blosc2 = ">=2.0.0"
11+
cairocffi = ">=1.6.1"
12+
certifi = ">=2023.11.17"
13+
cffi = ">=1.16.0"
14+
charset-normalizer = ">=3.3.2"
15+
click-option-group = ">=0.5.6"
16+
click = ">=8.1.7"
17+
colorama = ">=0.4.6"
18+
contourpy = ">=1.1.1"
19+
cooler = ">=0.9.3"
20+
cycler = ">=0.12.1"
21+
cython = ">=3.0.5"
22+
cytoolz = ">=0.12.2"
23+
dill = ">=0.3.7"
24+
filetype = ">=1.2.0"
25+
flask = ">=2.3.3"
26+
fonttools = ">=4.45.1"
27+
h5py = ">=3.10.0"
28+
hicmatrix = ">=15"
2929
idna = "*"
30-
importlib-metadata = "==6.8.0"
31-
importlib-resources = "==6.1.1"
32-
intervaltree = "==3.1.0"
33-
itsdangerous = "==2.1.2"
30+
importlib-metadata = ">=6.8.0"
31+
importlib-resources = ">=6.1.1"
32+
intervaltree = ">=3.1.0"
33+
itsdangerous = ">=2.1.2"
3434
jinja2 = "*"
35-
kiwisolver = "==1.4.5"
36-
loguru = "==0.6.0"
37-
markupsafe = "==2.1.3"
38-
matplotlib = "==3.7.4"
39-
msgpack = "==1.0.7"
40-
multiprocess = "==0.70.15"
41-
numexpr = "==2.8.6"
42-
numpy = "==1.24.4"
43-
packaging = "==23.2"
44-
pandas = "==1.5.3"
35+
kiwisolver = ">=1.4.5"
36+
loguru = ">=0.6.0"
37+
markupsafe = ">=2.1.3"
38+
matplotlib = ">=3.7.4"
39+
msgpack = ">=1.0.7"
40+
multiprocess = ">=0.70.15"
41+
numexpr = ">=2.8.6"
42+
numpy = ">=1.24.4"
43+
packaging = ">=23.2"
44+
pandas = ">=1.5.3"
4545
pillow = "*"
46-
py-cpuinfo = "==9.0.0"
47-
pybigwig = "==0.3.22"
48-
pycparser = "==2.21"
49-
pyfaidx = "==0.7.2.2"
50-
pyparsing = "==3.1.1"
51-
pysam = "==0.21.0"
52-
python-dateutil = "==2.8.2"
53-
pytz = "==2023.3.post1"
54-
pyyaml = "==6.0.1"
55-
requests = "==2.31.0"
56-
scipy = "==1.10.1"
57-
seaborn = "==0.12.2"
58-
simplejson = "==3.19.2"
59-
six = "==1.16.0"
60-
sortedcontainers = "==2.4.0"
61-
tables = "==3.8.0"
62-
toolz = "==0.12.0"
63-
urllib3 = "==2.1.0"
46+
py-cpuinfo = ">=9.0.0"
47+
pybigwig = ">=0.3.22"
48+
pycparser = ">=2.21"
49+
pyfaidx = ">=0.7.2.2"
50+
pyparsing = ">=3.1.1"
51+
pysam = ">=0.21.0"
52+
python-dateutil = ">=2.8.2"
53+
pytz = ">=2023.3.post1"
54+
pyyaml = ">=6.0.1"
55+
requests = ">=2.32.0"
56+
scipy = ">=1.10.1"
57+
seaborn = ">=0.12.2"
58+
simplejson = ">=3.19.2"
59+
six = ">=1.16.0"
60+
sortedcontainers = ">=2.4.0"
61+
tables = ">=3.8.0"
62+
toolz = ">=0.12.0"
63+
urllib3 = ">=2.1.0"
6464
werkzeug = "*"
65-
win32-setctime = "==1.1.0"
66-
xmltodict = "==0.13.0"
67-
zipp = "==3.17.0"
65+
win32-setctime = ">=1.1.0"
66+
xmltodict = ">=0.13.0"
67+
zipp = ">=3.17.0"
6868

6969
[dev-packages]
7070

example/density_list.tsv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ example/bams/3.bam bam 3bam blue
66
example/bams/sc.bam bam sc red frf 1000000
77
example/bams/sc.bam bam sc1 blue frf 1000000
88
example/depth.bgz depth depth
9-
example/bedgraph/ENCFF260QGF_lung_filter.bedgraph.gz bedgraph bedgraph

poetry.lock

Lines changed: 67 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "trackplot"
3-
version = "0.3.7"
3+
version = "0.3.8"
44
description = "The trackplot is a tool for visualizing various next-generation sequencing (NGS) data, including DNA-seq, RNA-seq, single-cell RNA-seq and full-length sequencing datasets. https://sashimi.readthedocs.io/"
55
authors = ["ygidtu <ygidtu@gmail.com>"]
66
license = "BSD-3"

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
adjusttext==0.7.3 ; python_version >= "3.8" and python_version < "3.12"
22
asciitree==0.3.3 ; python_version >= "3.8" and python_version < "3.12"
3-
blinker==1.8.1 ; python_version >= "3.8" and python_version < "3.12"
3+
blinker==1.8.2 ; python_version >= "3.8" and python_version < "3.12"
44
blosc2==2.0.0 ; python_version >= "3.8" and python_version < "3.12"
55
cairocffi==1.7.0 ; python_version >= "3.8" and python_version < "3.12"
66
certifi==2024.2.2 ; python_version >= "3.8" and python_version < "3.12"
@@ -10,14 +10,14 @@ click-option-group==0.5.6 ; python_version >= "3.8" and python_version < "3.12"
1010
click==8.1.7 ; python_version >= "3.8" and python_version < "3.12"
1111
colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
1212
contourpy==1.1.1 ; python_version >= "3.8" and python_version < "3.12"
13-
cooler==0.9.3 ; python_version >= "3.8" and python_version < "3.12"
13+
cooler==0.10.0 ; python_version >= "3.8" and python_version < "3.12"
1414
cycler==0.12.1 ; python_version >= "3.8" and python_version < "3.12"
1515
cython==3.0.10 ; python_version >= "3.8" and python_version < "3.12"
1616
cytoolz==0.12.3 ; python_version >= "3.8" and python_version < "3.12"
1717
dill==0.3.8 ; python_version >= "3.8" and python_version < "3.12"
1818
filetype==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
1919
flask==2.3.3 ; python_version >= "3.8" and python_version < "3.12"
20-
fonttools==4.51.0 ; python_version >= "3.8" and python_version < "3.12"
20+
fonttools==4.52.4 ; python_version >= "3.8" and python_version < "3.12"
2121
h5py==3.11.0 ; python_version >= "3.8" and python_version < "3.12"
2222
hicmatrix==15 ; python_version >= "3.8" and python_version < "3.12"
2323
idna==3.7 ; python_version >= "3.8" and python_version < "3.12"
@@ -46,10 +46,10 @@ pysam==0.21.0 ; python_version >= "3.8" and python_version < "3.12"
4646
python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "3.12"
4747
pytz==2024.1 ; python_version >= "3.8" and python_version < "3.12"
4848
pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.12"
49-
requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
49+
requests==2.32.2 ; python_version >= "3.8" and python_version < "3.12"
5050
scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.12"
5151
seaborn==0.12.2 ; python_version >= "3.8" and python_version < "3.12"
52-
setuptools==69.5.1 ; python_version >= "3.8" and python_version < "3.12"
52+
setuptools==70.0.0 ; python_version >= "3.8" and python_version < "3.12"
5353
simplejson==3.19.2 ; python_version >= "3.8" and python_version < "3.12"
5454
six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
5555
sortedcontainers==2.4.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -59,4 +59,4 @@ urllib3==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
5959
werkzeug==3.0.3 ; python_version >= "3.8" and python_version < "3.12"
6060
win32-setctime==1.1.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
6161
xmltodict==0.13.0 ; python_version >= "3.8" and python_version < "3.12"
62-
zipp==3.18.1 ; python_version >= "3.8" and python_version < "3.12"
62+
zipp==3.19.0 ; python_version >= "3.8" and python_version < "3.12"

trackplot/plot.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
faulthandler.enable()
3030

3131

32-
__version__ = "0.3.7"
32+
__version__ = "0.3.8"
3333
__author__ = "ygidtu & Ran Zhou"
3434
__email__ = "ygidtu@gmail.com"
3535

@@ -1210,6 +1210,11 @@ def plot(self,
12101210
if p.type == "density":
12111211
if isinstance(p.obj[0], Depth):
12121212
for key, readDepth in p.obj[0].data.items():
1213+
temp_params = self.params.get(p, {})
1214+
1215+
if "y_label" not in temp_params:
1216+
temp_params["y_label"] = key
1217+
12131218
plot_density(
12141219
ax=ax_var,
12151220
data=readDepth,
@@ -1220,8 +1225,7 @@ def plot(self,
12201225
distance_between_label_axis=distance_between_label_axis,
12211226
raster=raster,
12221227
fill_step=fill_step,
1223-
y_label=key,
1224-
**self.params.get(p, {})
1228+
**temp_params
12251229
)
12261230
curr_idx += 1
12271231
ax_var = plt.subplot(gs[curr_idx, 0])

trackplot/plot_func.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,7 @@ def plot_density(
807807
jxn_numbers.append(t)
808808

809809
try:
810-
adjust_text(jxn_numbers, force_text=0.2, arrowprops=dict(arrowstyle="-", color='black', lw=1),
811-
autoalign="y")
810+
adjust_text(jxn_numbers, force_text=(0.2, 0.2), arrowprops=dict(arrowstyle="-", color='black', lw=1))
812811
except IndexError as err:
813812
logger.debug(err)
814813

@@ -1366,6 +1365,9 @@ def plot_motif(ax: mpl.axes.Axes,
13661365
graph_coords = init_graph_coords(region)
13671366

13681367
# 在原始坐标轴上画motif
1368+
if not data:
1369+
logger.info("there is no any motif information to plot")
1370+
return
13691371
ymin, ymax, xmin, xmax = 0, 0, \
13701372
graph_coords[min(data.keys()) - region.start], \
13711373
graph_coords[max(data.keys()) - region.start] + (1 + width) / 2

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "trackplot",
33
"private": true,
4-
"version": "0.3.7",
4+
"version": "0.3.8",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

0 commit comments

Comments
 (0)