Merge pull request #548 from sanger/develop

Release-3.7.2
sanger · Nov 6, 2020 · 3a888d4 · 3a888d4
2 parents 31ae439 + a39f4ba
commit 3a888d4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     popper_js (1.16.0)
     pry (0.13.1)
@@ -211,7 +211,7 @@ GEM
       json
       websocket (~> 1.0)
     rack (2.2.3)
-    rack-mini-profiler (2.0.2)
+    rack-mini-profiler (2.2.0)
       rack (>= 1.2.0)
     rack-proxy (0.6.5)
       rack
@@ -250,7 +250,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.8.0)
+    regexp_parser (1.8.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -274,21 +274,21 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.91.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.2)
-      parser (>= 2.7.1.4)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
     rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.8.0)
+    rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.87.0)
@@ -358,7 +358,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.9.1)
+    webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

diff --git a/config/pipelines/high_throughput_heron_384_tailed.yml b/config/pipelines/high_throughput_heron_384_tailed.yml
@@ -2,7 +2,9 @@
 Heron-384 Tailed A: # Heron 384-well pipeline specific to PCR 1 plate
   filters:
     request_type_key: limber_heron_lthr
-    library_type: PCR amplicon tailed adapters 384
+    library_type:
+    - PCR amplicon tailed adapters 384
+    - Sanger_tailed_artic_v1_384
   library_pass: LTHR-384 Lib PCR pool
   relationships:
     LTHR-384 RT: LTHR-384 PCR 1

diff --git a/config/pipelines/high_throughput_heron_96_tailed.yml b/config/pipelines/high_throughput_heron_96_tailed.yml
@@ -2,7 +2,9 @@
 Heron-96 Tailed A: # Heron 96-well pipeline specific to PCR 1 plate
   filters:
     request_type_key: limber_heron_lthr
-    library_type: PCR amplicon tailed adapters 96
+    library_type:
+    - PCR amplicon tailed adapters 96
+    - Sanger_tailed_artic_v1_96
   library_pass: LTHR Lib PCR pool
   relationships:
     LTHR RT: LTHR PCR 1

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "@rails/webpacker": "5.1.1",
     "axios": "^0.19.2",
     "bootstrap-vue": "^2.17.3",
-    "cytoscape": "^3.16.1",
+    "cytoscape": "^3.16.3",
     "devour-client": "^2.0.15",
     "flush-promises": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.25",
-    "axios-mock-adapter": "^1.15.0",
+    "axios-mock-adapter": "^1.19.0",
     "babel-eslint": "^10.0.1",
     "eslint": "^6.0.0",
     "eslint-plugin-jasmine": "^4.1.1",

diff --git a/yarn.lock b/yarn.lock
@@ -1406,12 +1406,12 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
   integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
-axios-mock-adapter@^1.15.0:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.18.2.tgz#01fa9e88e692e8f1bbc1ad1200dde672486e03c7"
-  integrity sha512-e5aTsPy2Viov22zNpFTlid76W1Scz82pXeEwwCXdtO85LROhHAF8pHF2qDhiyMONLxKyY3lQ+S4UCsKgrlx8Hw==
+axios-mock-adapter@^1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.19.0.tgz#9d72e321a6c5418e1eff067aa99761a86c5188a4"
+  integrity sha512-D+0U4LNPr7WroiBDvWilzTMYPYTuZlbo6BI8YHZtj7wYQS8NkARlP9KBt8IWWHTQJ0q/8oZ0ClPBtKCCkx8cQg==
   dependencies:
-    fast-deep-equal "^3.1.1"
+    fast-deep-equal "^3.1.3"
     is-buffer "^2.0.3"
 
 axios@^0.19.0, axios@^0.19.2:
@@ -2613,10 +2613,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cytoscape@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.16.1.tgz#eed220bb2ee96426491709a492aa58974095e1de"
-  integrity sha512-/v5x34izBlUs0ELZP5ELYJzKZjHLkgWtoe4Uu0OEUcagzo/198hUzTze2R1Td8Ve9ASeU5y36C355aR1I2pd7w==
+cytoscape@^3.16.3:
+  version "3.16.3"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.16.3.tgz#8880911da5d6192f6acda1095d18aa7662e89d2f"
+  integrity sha512-OGu9r5jsU2IgmqDy0NpW1M7ze2muvnJ3yNIB1mlzDLA7fcGI0aeE2hmLIoowi8E3+6HJF8Scx2iXGp11tbXHEg==
   dependencies:
     heap "^0.2.6"
     lodash.debounce "^4.0.8"
@@ -3378,7 +3378,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==