bio-grumpy 1.1.5__tar.gz → 1.2.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/.github/workflows/release.yaml +1 -25
  2. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/Cargo.lock +28 -63
  3. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/Cargo.toml +2 -2
  4. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/PKG-INFO +1 -1
  5. bio_grumpy-1.2.3/reference/TEST-DNA-double.gbk +150 -0
  6. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/src/common.rs +11 -15
  7. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/src/difference.rs +2 -2
  8. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/src/gene.rs +5 -5
  9. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/src/genome.rs +230 -113
  10. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/src/lib.rs +7 -2
  11. bio_grumpy-1.2.3/src/main.rs +159 -0
  12. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/src/vcf.rs +57 -15
  13. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/TEST-DNA-4-minor.vcf +1 -1
  14. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/TEST-DNA-4.vcf +1 -1
  15. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/TEST-DNA-misc-indel.vcf +3 -3
  16. bio_grumpy-1.2.3/test/TEST-DNA.vcf +28 -0
  17. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/complex.vcf +4 -4
  18. bio_grumpy-1.2.3/test/dummy.vcf +22 -0
  19. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/intracellulare.vcf +3 -3
  20. bio_grumpy-1.1.5/src/main.rs +0 -158
  21. bio_grumpy-1.1.5/test/TEST-DNA.vcf +0 -27
  22. bio_grumpy-1.1.5/test/dummy.vcf +0 -22
  23. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/.github/workflows/gitleaks.yaml +0 -0
  24. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/.github/workflows/test.yaml +0 -0
  25. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/.gitignore +0 -0
  26. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/.gitleaks.toml +0 -0
  27. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/CITATION.bib +0 -0
  28. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/LICENSE +0 -0
  29. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/README-python.md +0 -0
  30. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/README.md +0 -0
  31. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/pyproject.toml +0 -0
  32. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/reference/MN908947.3.gb +0 -0
  33. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/reference/NC_000962.3.gbk +0 -0
  34. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/reference/NZ_CP085945.1.gbk +0 -0
  35. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/reference/TEST-DNA.gbk +0 -0
  36. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/minor-populations-revcomp-AD.vcf +0 -0
  37. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/minor-populations-revcomp.vcf +0 -0
  38. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/revcomp-del-first-pos.vcf +0 -0
  39. {bio_grumpy-1.1.5 → bio_grumpy-1.2.3}/test/tb-snp-after-del.vcf +0 -0
@@ -90,30 +90,6 @@ jobs:
90
90
  name: wheels-musllinux-${{ matrix.platform.target }}
91
91
  path: dist
92
92
 
93
- macos:
94
- runs-on: ${{ matrix.platform.runner }}
95
- strategy:
96
- matrix:
97
- platform:
98
- - runner: macos-14
99
- target: aarch64
100
- steps:
101
- - uses: actions/checkout@v4
102
- - uses: actions/setup-python@v5
103
- with:
104
- python-version: 3.x
105
- - name: Build wheels
106
- uses: PyO3/maturin-action@v1
107
- with:
108
- target: ${{ matrix.platform.target }}
109
- args: --release --out dist --find-interpreter
110
- sccache: 'true'
111
- - name: Upload wheels
112
- uses: actions/upload-artifact@v4
113
- with:
114
- name: wheels-macos-${{ matrix.platform.target }}
115
- path: dist
116
-
117
93
  sdist:
118
94
  runs-on: ubuntu-latest
119
95
  steps:
@@ -133,7 +109,7 @@ jobs:
133
109
  name: Release
134
110
  runs-on: ubuntu-latest
135
111
  if: "startsWith(github.ref, 'refs/tags/')"
136
- needs: [linux, musllinux, macos, sdist]
112
+ needs: [linux, musllinux, sdist]
137
113
  steps:
138
114
  - uses: actions/download-artifact@v4
139
115
  - name: Publish to PyPI
@@ -107,7 +107,7 @@ dependencies = [
107
107
  "heck",
108
108
  "proc-macro2",
109
109
  "quote",
110
- "syn 3.0.6",
110
+ "syn 3.0.10",
111
111
  ]
112
112
 
113
113
  [[package]]
@@ -155,9 +155,9 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
155
155
 
156
156
  [[package]]
157
157
  name = "either"
158
- version = "1.18.0"
158
+ version = "1.19.0"
159
159
  source = "registry+https://github.com/rust-lang/crates.io-index"
160
- checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
160
+ checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
161
161
 
162
162
  [[package]]
163
163
  name = "gb-io"
@@ -174,7 +174,7 @@ dependencies = [
174
174
 
175
175
  [[package]]
176
176
  name = "grumpy"
177
- version = "1.1.5"
177
+ version = "1.2.3"
178
178
  dependencies = [
179
179
  "clap",
180
180
  "gb-io",
@@ -192,15 +192,6 @@ version = "0.5.0"
192
192
  source = "registry+https://github.com/rust-lang/crates.io-index"
193
193
  checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
194
194
 
195
- [[package]]
196
- name = "indoc"
197
- version = "2.0.7"
198
- source = "registry+https://github.com/rust-lang/crates.io-index"
199
- checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
200
- dependencies = [
201
- "rustversion",
202
- ]
203
-
204
195
  [[package]]
205
196
  name = "is_terminal_polyfill"
206
197
  version = "1.70.2"
@@ -218,9 +209,9 @@ dependencies = [
218
209
 
219
210
  [[package]]
220
211
  name = "libc"
221
- version = "0.2.190"
212
+ version = "0.2.191"
222
213
  source = "registry+https://github.com/rust-lang/crates.io-index"
223
- checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
214
+ checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
224
215
 
225
216
  [[package]]
226
217
  name = "lock_api"
@@ -233,9 +224,9 @@ dependencies = [
233
224
 
234
225
  [[package]]
235
226
  name = "log"
236
- version = "0.4.34"
227
+ version = "0.4.35"
237
228
  source = "registry+https://github.com/rust-lang/crates.io-index"
238
- checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
229
+ checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c"
239
230
 
240
231
  [[package]]
241
232
  name = "memchr"
@@ -243,15 +234,6 @@ version = "2.8.3"
243
234
  source = "registry+https://github.com/rust-lang/crates.io-index"
244
235
  checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
245
236
 
246
- [[package]]
247
- name = "memoffset"
248
- version = "0.9.1"
249
- source = "registry+https://github.com/rust-lang/crates.io-index"
250
- checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
251
- dependencies = [
252
- "autocfg",
253
- ]
254
-
255
237
  [[package]]
256
238
  name = "minimal-lexical"
257
239
  version = "0.2.1"
@@ -378,36 +360,32 @@ dependencies = [
378
360
 
379
361
  [[package]]
380
362
  name = "pyo3"
381
- version = "0.25.1"
363
+ version = "0.30.1"
382
364
  source = "registry+https://github.com/rust-lang/crates.io-index"
383
- checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
365
+ checksum = "229ca13b8a15bb0d1487b81ab975bfcd97513416499a8312011b6036e42e0de4"
384
366
  dependencies = [
385
- "indoc",
386
367
  "libc",
387
- "memoffset",
388
368
  "once_cell",
389
369
  "portable-atomic",
390
370
  "pyo3-build-config",
391
371
  "pyo3-ffi",
392
372
  "pyo3-macros",
393
- "unindent",
394
373
  ]
395
374
 
396
375
  [[package]]
397
376
  name = "pyo3-build-config"
398
- version = "0.25.1"
377
+ version = "0.30.1"
399
378
  source = "registry+https://github.com/rust-lang/crates.io-index"
400
- checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
379
+ checksum = "70130e2b6dd1ee589a8788026a429561ca5c40fa7a2fa7914c2282eddae24700"
401
380
  dependencies = [
402
- "once_cell",
403
381
  "target-lexicon",
404
382
  ]
405
383
 
406
384
  [[package]]
407
385
  name = "pyo3-ffi"
408
- version = "0.25.1"
386
+ version = "0.30.1"
409
387
  source = "registry+https://github.com/rust-lang/crates.io-index"
410
- checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
388
+ checksum = "5e7ff73c555c286d212d4ce7e5fbda845a973c4f61bd5f160f5f2c3c2a04d1c4"
411
389
  dependencies = [
412
390
  "libc",
413
391
  "pyo3-build-config",
@@ -415,27 +393,26 @@ dependencies = [
415
393
 
416
394
  [[package]]
417
395
  name = "pyo3-macros"
418
- version = "0.25.1"
396
+ version = "0.30.1"
419
397
  source = "registry+https://github.com/rust-lang/crates.io-index"
420
- checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
398
+ checksum = "c46d2e5862c7bb8207e3b639f713dda3c499933444784154c11d013c5a691b60"
421
399
  dependencies = [
422
400
  "proc-macro2",
423
401
  "pyo3-macros-backend",
424
402
  "quote",
425
- "syn 2.0.119",
403
+ "syn 3.0.10",
426
404
  ]
427
405
 
428
406
  [[package]]
429
407
  name = "pyo3-macros-backend"
430
- version = "0.25.1"
408
+ version = "0.30.1"
431
409
  source = "registry+https://github.com/rust-lang/crates.io-index"
432
- checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
410
+ checksum = "38b89f066f2ae72a2aef52d1537ca2fcd104440ebfadee06e97aa90738a25b9b"
433
411
  dependencies = [
434
412
  "heck",
435
413
  "proc-macro2",
436
- "pyo3-build-config",
437
414
  "quote",
438
- "syn 2.0.119",
415
+ "syn 3.0.10",
439
416
  ]
440
417
 
441
418
  [[package]]
@@ -476,12 +453,6 @@ dependencies = [
476
453
  "bitflags",
477
454
  ]
478
455
 
479
- [[package]]
480
- name = "rustversion"
481
- version = "1.0.23"
482
- source = "registry+https://github.com/rust-lang/crates.io-index"
483
- checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
484
-
485
456
  [[package]]
486
457
  name = "scopeguard"
487
458
  version = "1.2.0"
@@ -514,7 +485,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
514
485
  dependencies = [
515
486
  "proc-macro2",
516
487
  "quote",
517
- "syn 3.0.6",
488
+ "syn 3.0.10",
518
489
  ]
519
490
 
520
491
  [[package]]
@@ -525,9 +496,9 @@ checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256"
525
496
 
526
497
  [[package]]
527
498
  name = "smallvec"
528
- version = "1.16.2"
499
+ version = "1.16.5"
529
500
  source = "registry+https://github.com/rust-lang/crates.io-index"
530
- checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
501
+ checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46"
531
502
 
532
503
  [[package]]
533
504
  name = "string_cache"
@@ -561,9 +532,9 @@ dependencies = [
561
532
 
562
533
  [[package]]
563
534
  name = "syn"
564
- version = "3.0.6"
535
+ version = "3.0.10"
565
536
  source = "registry+https://github.com/rust-lang/crates.io-index"
566
- checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
537
+ checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79"
567
538
  dependencies = [
568
539
  "proc-macro2",
569
540
  "quote",
@@ -613,20 +584,14 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
613
584
  dependencies = [
614
585
  "proc-macro2",
615
586
  "quote",
616
- "syn 3.0.6",
587
+ "syn 3.0.10",
617
588
  ]
618
589
 
619
590
  [[package]]
620
591
  name = "unicode-ident"
621
- version = "1.0.26"
622
- source = "registry+https://github.com/rust-lang/crates.io-index"
623
- checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
624
-
625
- [[package]]
626
- name = "unindent"
627
- version = "0.2.4"
592
+ version = "1.0.27"
628
593
  source = "registry+https://github.com/rust-lang/crates.io-index"
629
- checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
594
+ checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
630
595
 
631
596
  [[package]]
632
597
  name = "utf8parse"
@@ -1,6 +1,6 @@
1
1
  [package]
2
2
  name = "grumpy"
3
- version = "1.1.5"
3
+ version = "1.2.3"
4
4
  edition = "2021"
5
5
  description = "Genetic analysis in Rust."
6
6
  license-file = "LICENSE"
@@ -13,7 +13,7 @@ gb-io = "0.9.0"
13
13
  ordered-float = "4.2.1"
14
14
  string_cache = "0.8.7"
15
15
  vcf = "0.6.1"
16
- pyo3 = { version = "0.25.0", features = ["extension-module"] }
16
+ pyo3 = { version = "0.30", features = ["extension-module", "abi3-py39", "abi3-py310", "abi3-py311", "abi3-py312", "abi3-py313"] }
17
17
  pretty_assertions = "1.4.0"
18
18
  rayon = "1.10.0"
19
19
  clap = { version = "4.5.40", features = ["derive"] }
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bio-grumpy
3
- Version: 1.1.5
3
+ Version: 1.2.3
4
4
  Classifier: Development Status :: 5 - Production/Stable
5
5
  Classifier: Programming Language :: Rust
6
6
  Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -0,0 +1,150 @@
1
+ LOCUS TEST_DNA 99 bp DNA linear VRL 21-JUL-2021
2
+ DEFINITION TEST_DNA, complete genome.
3
+ ACCESSION TEST_DNA
4
+ VERSION TEST_DNA.1
5
+ DBLINK BioProject: DNAID
6
+ KEYWORDS DNA.
7
+ SOURCE TEST_DNA_SOURCE
8
+ ORGANISM TEST_DNA_ORGANISM
9
+ REFERENCE 1 (bases 1 to 99)
10
+ AUTHORS Test,1., Test,2., Test,3.
11
+ TITLE Test title for a reference for an DNA strand
12
+ JOURNAL Test journal for an DNA strand
13
+ PUBMED 1
14
+ COMMENT This is some comment about TEST_DNA genome.
15
+ FEATURES Location/Qualifiers
16
+ source 1..99
17
+ /organism="TEST_DNA"
18
+ /mol_type="genomic DNA"
19
+ /isolate="DNA_ISO"
20
+ /db_xref="taxon:1"
21
+ gene 4..30
22
+ /gene="A"
23
+ /locus_tag="TEST_DNA_A"
24
+ /db_xref="GeneID:1"
25
+ mDNA 4..30
26
+ /gene="A"
27
+ /locus_tag="TEST_DNA_A"
28
+ /product="nucleoprotein"
29
+ /db_xref="GeneID:1"
30
+ CDS 4..30
31
+ /gene="A"
32
+ /locus_tag="TEST_DNA_A"
33
+ /codon_start=1
34
+ /product="nucleoprotein"
35
+ /protein_id="PROTEIN_A"
36
+ /db_xref="GeneID:1"
37
+ /translation="KKTPPPGGG"
38
+ gene 28..60
39
+ /gene="B"
40
+ /locus_tag="TEST_DNA_B"
41
+ /db_xref="GeneID:2"
42
+ mDNA 28..60
43
+ /gene="B"
44
+ /locus_tag="TEST_DNA_B"
45
+ /product="nucleoprotein"
46
+ /db_xref="GeneID:2"
47
+ CDS 28..60
48
+ /gene="B"
49
+ /locus_tag="TEST_DNA_B"
50
+ /codon_start=1
51
+ /product="nucleoprotein"
52
+ /protein_id="PROTEIN_B"
53
+ /db_xref="GeneID:2"
54
+ /translation="GGFFF!KKNPPP"
55
+ gene complement(91..96)
56
+ /gene="C"
57
+ /locus_tag="TEST_DNA_C"
58
+ /db_xref="GeneID:3"
59
+ mDNA complement(91..96)
60
+ /gene="C"
61
+ /locus_tag="TEST_DNA_C"
62
+ /product="nucleoprotein"
63
+ /db_xref="GeneID:3"
64
+ CDS complement(91..96)
65
+ /gene="C"
66
+ /locus_tag="TEST_DNA_C"
67
+ /codon_start=1
68
+ /product="nucleoprotein"
69
+ /protein_id="PROTEIN_C"
70
+ /db_xref="GeneID:3"
71
+ /translation="PP"
72
+ ORIGIN
73
+ 1 aaaaaaaaaa cccccccccc gggggggggg tttttttttt aaaaaaaaaa cccccccccc
74
+ 61 gggggggggg tttttttttt aaaaaaaaaa ccccccccc
75
+ //
76
+ LOCUS TEST_DNA 99 bp DNA linear VRL 21-JUL-2021
77
+ DEFINITION TEST_DNA, complete genome.
78
+ ACCESSION TEST_DNA
79
+ VERSION TEST_DNA.2
80
+ DBLINK BioProject: DNAID
81
+ KEYWORDS DNA.
82
+ SOURCE TEST_DNA_SOURCE
83
+ ORGANISM TEST_DNA_ORGANISM
84
+ REFERENCE 1 (bases 1 to 99)
85
+ AUTHORS Test,1., Test,2., Test,3.
86
+ TITLE Test title for a reference for an DNA strand
87
+ JOURNAL Test journal for an DNA strand
88
+ PUBMED 1
89
+ COMMENT This is some comment about TEST_DNA genome.
90
+ FEATURES Location/Qualifiers
91
+ source 1..99
92
+ /organism="TEST_DNA"
93
+ /mol_type="genomic DNA"
94
+ /isolate="DNA_ISO"
95
+ /db_xref="taxon:1"
96
+ gene 4..30
97
+ /gene="A"
98
+ /locus_tag="TEST_DNA_A"
99
+ /db_xref="GeneID:1"
100
+ mDNA 4..30
101
+ /gene="A"
102
+ /locus_tag="TEST_DNA_A"
103
+ /product="nucleoprotein"
104
+ /db_xref="GeneID:1"
105
+ CDS 4..30
106
+ /gene="A"
107
+ /locus_tag="TEST_DNA_A"
108
+ /codon_start=1
109
+ /product="nucleoprotein"
110
+ /protein_id="PROTEIN_A"
111
+ /db_xref="GeneID:1"
112
+ /translation="KKTPPPGGG"
113
+ gene 28..60
114
+ /gene="B"
115
+ /locus_tag="TEST_DNA_B"
116
+ /db_xref="GeneID:2"
117
+ mDNA 28..60
118
+ /gene="B"
119
+ /locus_tag="TEST_DNA_B"
120
+ /product="nucleoprotein"
121
+ /db_xref="GeneID:2"
122
+ CDS 28..60
123
+ /gene="B"
124
+ /locus_tag="TEST_DNA_B"
125
+ /codon_start=1
126
+ /product="nucleoprotein"
127
+ /protein_id="PROTEIN_B"
128
+ /db_xref="GeneID:2"
129
+ /translation="GGFFF!KKNPPP"
130
+ gene complement(91..96)
131
+ /gene="C"
132
+ /locus_tag="TEST_DNA_C"
133
+ /db_xref="GeneID:3"
134
+ mDNA complement(91..96)
135
+ /gene="C"
136
+ /locus_tag="TEST_DNA_C"
137
+ /product="nucleoprotein"
138
+ /db_xref="GeneID:3"
139
+ CDS complement(91..96)
140
+ /gene="C"
141
+ /locus_tag="TEST_DNA_C"
142
+ /codon_start=1
143
+ /product="nucleoprotein"
144
+ /protein_id="PROTEIN_C"
145
+ /db_xref="GeneID:3"
146
+ /translation="PP"
147
+ ORIGIN
148
+ 1 aaaaaaaaaa cccccccccc gggggggggg tttttttttt aaaaaaaaaa cccccccccc
149
+ 61 gggggggggg tttttttttt aaaaaaaaaa ccccccccc
150
+ //
@@ -4,9 +4,9 @@ use std::collections::HashMap;
4
4
 
5
5
  use ordered_float::OrderedFloat;
6
6
 
7
- #[pyclass(eq, eq_int)]
8
- #[derive(Debug, Clone, PartialEq, Eq)]
9
7
  /// Enum for the types alts can take
8
+ #[derive(Debug, Clone, PartialEq, Eq)]
9
+ #[pyclass(eq, eq_int, from_py_object)]
10
10
  pub enum AltType {
11
11
  SNP,
12
12
  REF,
@@ -16,51 +16,47 @@ pub enum AltType {
16
16
  DEL,
17
17
  }
18
18
 
19
- #[pyclass(eq, eq_int)]
20
- #[derive(Debug, Clone, PartialEq, Eq)]
21
19
  /// Enum for the types of minor evidence
20
+ #[derive(Debug, Clone, PartialEq, Eq)]
21
+ #[pyclass(eq, eq_int, from_py_object)]
22
22
  pub enum MinorType {
23
23
  COV,
24
24
  FRS,
25
25
  }
26
26
 
27
- #[pyclass(eq)]
27
+ #[pyclass(eq, get_all, set_all, from_py_object)]
28
28
  #[derive(Clone, Debug, Eq, PartialEq)]
29
29
  /// Struct to hold the information from a VCF row
30
30
  pub struct VCFRow {
31
- #[pyo3(get, set)]
31
+ /// Contig name this row refers to
32
+ pub chrom: String,
33
+
32
34
  /// Genome position specified in the VCF row
33
35
  pub position: i64,
34
36
 
35
- #[pyo3(get, set)]
36
37
  /// Reference base
37
38
  pub reference: String,
38
39
 
39
- #[pyo3(get, set)]
40
40
  /// Alt bases
41
41
  pub alternative: Vec<String>,
42
42
 
43
- #[pyo3(get, set)]
44
43
  /// Items in the filter column
45
44
  pub filter: Vec<String>,
46
45
 
47
- #[pyo3(get, set)]
48
46
  /// Mapping of FORMAT -> SAMPLE fields
49
47
  pub fields: HashMap<String, Vec<String>>,
50
48
 
51
- #[pyo3(get, set)]
52
49
  /// True if the filter column passes
53
50
  pub is_filter_pass: bool,
54
51
 
55
- #[pyo3(get, set)]
56
52
  /// Whether this VCF row is complex
57
53
  /// Complex VCF rows are edge cases where a row has a large (>1,000) bases for the ref as well as >1 alt
58
54
  /// This is used to flag when mutations' evidence isn't worth fetching due to size.
59
55
  pub is_complex: bool,
60
56
  }
61
57
 
62
- #[pyclass(eq)]
63
58
  #[derive(Clone, Debug, Eq, PartialEq)]
59
+ #[pyclass(eq, from_py_object)]
64
60
  /// Struct to hold the information parsed for a call
65
61
  pub struct Evidence {
66
62
  #[pyo3(get, set)]
@@ -118,7 +114,7 @@ impl Evidence {
118
114
  }
119
115
  }
120
116
 
121
- #[pyclass]
117
+ #[pyclass(from_py_object)]
122
118
  #[derive(Clone, Debug)]
123
119
  /// Struct to hold the information to construct a gene
124
120
  pub struct GeneDef {
@@ -147,7 +143,7 @@ pub struct GeneDef {
147
143
  pub promoter_size: i64,
148
144
  }
149
145
 
150
- #[pyclass(eq)]
146
+ #[pyclass(eq, from_py_object)]
151
147
  #[derive(Clone, Debug, Eq, PartialEq)]
152
148
  /// Struct to hold the information of a call
153
149
  pub struct Alt {
@@ -9,7 +9,7 @@ use crate::common::{Alt, AltType, Evidence, MinorType};
9
9
  use crate::gene::{codon_to_aa, Gene, GenePos};
10
10
  use crate::genome::Genome;
11
11
 
12
- #[pyclass]
12
+ #[pyclass(from_py_object)]
13
13
  #[derive(Clone, Debug, Eq, PartialEq)]
14
14
  /// Genome level variant
15
15
  pub struct Variant {
@@ -50,7 +50,7 @@ pub struct Variant {
50
50
  pub codon_idx: Option<i64>,
51
51
  }
52
52
 
53
- #[pyclass]
53
+ #[pyclass(from_py_object)]
54
54
  #[derive(Clone, Debug, Eq, PartialEq)]
55
55
  /// Gene level mutation
56
56
  pub struct Mutation {
@@ -7,7 +7,7 @@ use std::vec::Vec;
7
7
  use crate::common::{Alt, AltType, Evidence, GeneDef};
8
8
  use crate::genome::GenomePosition;
9
9
 
10
- #[pyclass(eq)]
10
+ #[pyclass(eq, from_py_object)]
11
11
  #[derive(Clone, Debug, Eq, PartialEq)]
12
12
  /// Each position of a gene can either be a nucleotde or a codon
13
13
  pub enum GenePos {
@@ -18,7 +18,7 @@ pub enum GenePos {
18
18
  Codon(CodonType),
19
19
  }
20
20
 
21
- #[pyclass(eq)]
21
+ #[pyclass(eq, from_py_object)]
22
22
  #[derive(Clone, Debug, Eq, PartialEq)]
23
23
  /// Tracks each constituent nucleotide in the codon, along with the amino acid it codes for
24
24
  pub struct CodonType {
@@ -31,7 +31,7 @@ pub struct CodonType {
31
31
  pub codon: Vec<NucleotideType>,
32
32
  }
33
33
 
34
- #[pyclass(eq)]
34
+ #[pyclass(eq, from_py_object)]
35
35
  #[derive(Clone, Debug, Eq, PartialEq)]
36
36
  /// Stores information about a single nucleotide in a gene
37
37
  pub struct NucleotideType {
@@ -60,7 +60,7 @@ pub struct NucleotideType {
60
60
  pub is_deleted_minor: bool,
61
61
  }
62
62
 
63
- #[pyclass(eq)]
63
+ #[pyclass(eq, from_py_object)]
64
64
  #[derive(Clone, Debug, Eq, PartialEq)]
65
65
  /// A position of a gene is some position in the gene, along with the data at that position
66
66
  pub struct GenePosition {
@@ -73,7 +73,7 @@ pub struct GenePosition {
73
73
  pub gene_position_data: GenePos,
74
74
  }
75
75
 
76
- #[pyclass]
76
+ #[pyclass(from_py_object)]
77
77
  #[derive(Clone, Debug, Eq, PartialEq)]
78
78
  /// A gene is a collection of gene positions, along with some metadata
79
79
  pub struct Gene {