Merge branch 'electricitymaps:master' into master

magol · Jun 7, 2024 · 36ef7da · 36ef7da
2 parents 1bc101d + eb76747
commit 36ef7da
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/parsers/EIA.py b/parsers/EIA.py
@@ -383,7 +383,6 @@
     "US-MIDW-MISO": ["biomass", "geothermal", "oil"],
     "US-TEN-TVA": ["biomass", "geothermal", "oil"],
     "US-SE-SOCO": ["biomass", "geothermal", "oil"],
-    "US-SE-SEPA": ["biomass", "geothermal", "oil"],
     "US-FLA-FPL": ["biomass", "geothermal", "oil"],
 }
 

diff --git a/web/package.json b/web/package.json
@@ -148,7 +148,7 @@
     "autoprefixer": "10.4.15",
     "colors": "^1.4.0",
     "css-mediaquery": "0.1.2",
-    "cypress": "13.8.1",
+    "cypress": "13.11.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-base": "^15.0.0",

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml