Merge branch 'remora2.0' into 'master'

Remora 2.0 See merge request algorithm/remora!185
nanoporetech · Dec 6, 2022 · 0a96bff · 0a96bff
2 parents 3d82cce + 0730cf0
commit 0a96bff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -32,7 +32,7 @@ install_requires =
  thop
  pandas
  pod5 >= 0.0.43
- pysam
+ pysam >= 0.20.0
  parasail
  requests
 

diff --git a/src/remora/__init__.py b/src/remora/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.1.1"
+__version__ = "2.0.0"
 
 
 class RemoraError(Exception):

diff --git a/src/remora/constants.py b/src/remora/constants.py
@@ -42,19 +42,12 @@
 CG_sup_v3.5.1_2.
 """
 MODEL_DICT = {
- "dna_r9.4.1_e8_400bps": {
+ "dna_r9.4.1_e8": {
  "5mc": {
  "CG": {
- "sup": {"v3.5.1": {2: ""}},
- "hac": {"v3.5.1": {2: ""}},
- "fast": {"v3.5.1": {2: ""}},
- }
- },
- "5hmc_5mc": {
- "CG": {
- "sup": {"v3.5.1": {2: ""}},
- "hac": {"v3.5.1": {2: ""}},
- "fast": {"v3.5.1": {2: ""}},
+ "sup": {"v3.5.1": {0: "qedo6lilt29haqtdd97tic83lxoribfr"}},
+ "hac": {"v3.5.1": {0: "icimz7z06ijdme9zkfletxl323nveunh"}},
+ "fast": {"v3.5.1": {0: "ogtg6odxf9elj0mqjqxpx7xw82j5finz"}},
  }
  },
  },
@@ -80,9 +73,9 @@
  },
  "5hmc_5mc": {
  "CG": {
- "sup": {"v3.5.1": {2: ""}},
- "hac": {"v3.5.1": {2: ""}},
- "fast": {"v3.5.1": {2: ""}},
+ "sup": {"v4.0.0": {2: "whlux6wohu5fwyg4mreg5mz0a8iaugxk"}},
+ "hac": {"v4.0.0": {2: "o1ah5qgd77l393gjnyrv44jt4wp6wxcl"}},
+ "fast": {"v4.0.0": {2: "hms1t8ledf09p8ta9katj90l29uz2qll"}},
  }
  },
  },