Merge branch 'develop' into feature/revert

ecmwf · Nov 29, 2023 · 28ff1aa · 28ff1aa
2 parents b4f86ce + 9c60aef
commit 28ff1aa
Show file tree

Hide file tree

Showing 82 changed files with 600 additions and 3,446 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,6 @@ tmp.*
 *.ppm
 .env
 *.swp
+
+# mac
+.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -72,7 +72,23 @@
         "system_error": "cpp",
         "tuple": "cpp",
         "type_traits": "cpp",
-        "typeinfo": "cpp"
+        "typeinfo": "cpp",
+        "__hash_table": "cpp",
+        "array": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "numbers": "cpp",
+        "queue": "cpp",
+        "random": "cpp",
+        "semaphore": "cpp",
+        "strstream": "cpp",
+        "thread": "cpp",
+        "unordered_map": "cpp",
+        "memory_resource": "cpp",
+        "stop_token": "cpp",
+        "cinttypes": "cpp"
     },
     "esbonio.server.enabled": true
 }
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+4.14.2
diff --git a/docs/confluence/tojson.py b/docs/confluence/tojson.py
@@ -138,6 +138,7 @@ def thickness(p, attrs):
         "Colour": anyset,
         "LineStyle": lineset,
         "ListPolicy": listpolicy,
+        "ColourListPolicy": colourpolicy,
         "ColourTechnique": colourtechnique,
         "ArrowPosition": arrowposition,
         "Justification": justification,

diff --git a/notebook/mongo.ipynb b/notebook/mongo.ipynb
diff --git a/notebook/releases/magics-4.11.0.ipynb b/notebook/releases/magics-4.11.0.ipynb
@@ -243,7 +243,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -257,7 +257,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.10"
+   "version": "3.9.12"
   }
  },
  "nbformat": 4,

diff --git a/notebook/releases/magics-4.12.0.ipynb b/notebook/releases/magics-4.12.0.ipynb
@@ -357,7 +357,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.10"
+   "version": "3.9.12"
   }
  },
  "nbformat": 4,

diff --git a/share/magics/styles/ecmwf/test/styles.json b/share/magics/styles/ecmwf/test/styles.json
@@ -0,0 +1,6 @@
+{
+    "red_lines" : {
+        "contour" : "on",
+        "contour_line_colour" : "red"
+    }
+}
diff --git a/share/magics/symbols.svg b/share/magics/symbols.svg
diff --git a/src/attributes/BoxPlotBoxAttributes.cc b/src/attributes/BoxPlotBoxAttributes.cc
diff --git a/src/attributes/BoxPlotBoxAttributes.h b/src/attributes/BoxPlotBoxAttributes.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,3 +41,6 @@ tmp.* @@
     *.ppm
     .env
     *.swp
+    # mac
+    .DS_Store