Fixing test dependencies for stability

Author: merschformann

README.md

@@ -125,16 +125,16 @@ Then, add the following line to your `~/.bashrc`:
 eval "$(register-python-argcomplete nextplot)"
 ```
 
-## Development setup
+## Tests
 
-### Install development dependencies
+Tests are located in `tests/` and can be run via `python -m pytest`. Update test
+expectations (golden files) by running `UPDATE=1 python test_cli.py` from the
+test directory. Tests require specific versions of the dependencies to be
+installed. These can be installed via `pip install -r requirements-dev.txt`.
+It is recommended to update the expectations in a docker container to avoid
+messing up local dependencies. This can be done by running the following
+commands:
 
 ```bash
-pip install -r requirements-dev.txt
+docker run --rm -it -v $(pwd):/app -w /app python:3.9 bash -c "pip install -r requirements-dev.txt && cd tests && UPDATE=1 python test_cli.py"
 ```
-
-### Tests
-
-Tests are located in `tests/` and can be run via `python -m pytest`. Update test
-expectations (golden files) by running `UPDATE=1 python test_cli.py` from the
-test directory.

requirements-dev.txt

@@ -1,12 +1,12 @@
-argcomplete>=2.0.0
-colorutils>=0.3.0
-folium>=0.12.1
-jsonpath_ng>=1.5.3
-kaleido>=0.2.1
-numpy>=1.22.3
-plotly>=5.7.0
-scipy>=1.8.0
-pytest>=7.1.1
-imagehash>=4.2.1
-ruff>=0.1.7
-hatch>=1.9.1
+argcomplete==2.0.0
+colorutils==0.3.0
+folium==0.12.1
+jsonpath_ng==1.5.3
+kaleido==0.2.1
+numpy==1.22.3
+plotly==5.7.0
+scipy==1.8.0
+pytest==7.1.1
+imagehash==4.3.1
+ruff==0.1.7
+hatch==1.9.1

tests/testdata/fleet-cloud-comparison.html.golden

@@ -1 +1 @@
-f0f081e3796a039f
+f0f281e3796a031f

tests/testdata/fleet-cloud-comparison.png.golden

@@ -11,14 +11,14 @@
 
     <style>html, body {width: 100%;height: 100%;margin: 0;padding: 0;}</style>
     <style>#map {position:absolute;top:0;bottom:0;right:0;left:0;}</style>
-    <script src="https://cdn.jsdelivr.net/npm/leaflet@1.9.3/dist/leaflet.js"></script>
-    <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.js"></script>
+    <script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.9.3/dist/leaflet.css"/>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css"/>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"/>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/leaflet.awesome.rotate.min.css"/>
 
@@ -32,7 +32,6 @@
                     left: 0.0%;
                     top: 0.0%;
                 }
-                .leaflet-container { font-size: 1rem; }
             </style>
 
 </head>
@@ -64,44 +63,32 @@
 
 
             var tile_layer_ = L.tileLayer(
-                "https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
-                {"attribution": "\u0026copy; \u003ca href=\"https://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors \u0026copy; \u003ca href=\"https://carto.com/attributions\"\u003eCARTO\u003c/a\u003e", "detectRetina": false, "maxNativeZoom": 20, "maxZoom": 20, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abcd", "tms": false}
-            );
-        
-    
-            tile_layer_.addTo(map_);
+                "https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
+                {"attribution": "\u0026copy; \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors \u0026copy; \u003ca href=\"http://cartodb.com/attributions\"\u003eCartoDB\u003c/a\u003e, CartoDB \u003ca href =\"http://cartodb.com/attributions\"\u003eattributions\u003c/a\u003e", "detectRetina": false, "maxNativeZoom": 18, "maxZoom": 18, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
+            ).addTo(map_);
 
 
             var tile_layer_ = L.tileLayer(
-                "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png",
-                {"attribution": "\u0026copy; \u003ca href=\"https://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors \u0026copy; \u003ca href=\"https://carto.com/attributions\"\u003eCARTO\u003c/a\u003e", "detectRetina": false, "maxNativeZoom": 20, "maxZoom": 20, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abcd", "tms": false}
-            );
-        
-    
-            tile_layer_.addTo(map_);
+                "https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png",
+                {"attribution": "\u0026copy; \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors \u0026copy; \u003ca href=\"http://cartodb.com/attributions\"\u003eCartoDB\u003c/a\u003e, CartoDB \u003ca href =\"http://cartodb.com/attributions\"\u003eattributions\u003c/a\u003e", "detectRetina": false, "maxNativeZoom": 18, "maxZoom": 18, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
+            ).addTo(map_);
 
 
             var tile_layer_ = L.tileLayer(
-                "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
-                {"attribution": "\u0026copy; \u003ca href=\"https://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors", "detectRetina": false, "maxNativeZoom": 19, "maxZoom": 19, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
-            );
-        
-    
-            tile_layer_.addTo(map_);
+                "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+                {"attribution": "Data by \u0026copy; \u003ca href=\"http://openstreetmap.org\"\u003eOpenStreetMap\u003c/a\u003e, under \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eODbL\u003c/a\u003e.", "detectRetina": false, "maxNativeZoom": 18, "maxZoom": 18, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
+            ).addTo(map_);
 
 
             var tile_layer_ = L.tileLayer(
                 "https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}{r}.png",
                 {"attribution": "\u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e", "detectRetina": false, "maxNativeZoom": 18, "maxZoom": 18, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
-            );
-        
-    
-            tile_layer_.addTo(map_);
+            ).addTo(map_);
 
 
             var feature_group_ = L.featureGroup(
                 {}
-            );
+            ).addTo(map_);
 
 
             var polygon_ = L.polygon(
@@ -113,10 +100,8 @@
         var popup_ = L.popup({"autoClose": false, "closeOnClick": false, "maxWidth": 450});
 
 
-            
-                var html_ = $(`<div id="html_" style="width: 100.0%; height: 100.0%;"><p>Cluster: 0 / 2</br>Cluster points: 7</br>Cluster diameter: 5.10 km (3.17 miles)</br></p></div>`)[0];
-                popup_.setContent(html_);
-            
+            var html_ = $(`<div id="html_" style="width: 100.0%; height: 100.0%;"><p>Cluster: 0 / 2</br>Cluster points: 7</br>Cluster diameter: 5.10 km (3.17 miles)</br></p></div>`)[0];
+            popup_.setContent(html_);
 
 
         polygon_.bindPopup(popup_)
@@ -125,12 +110,9 @@
 
 
 
-            feature_group_.addTo(map_);
-        
-    
             var feature_group_ = L.featureGroup(
                 {}
-            );
+            ).addTo(map_);
 
 
             var polygon_ = L.polygon(
@@ -142,10 +124,8 @@
         var popup_ = L.popup({"autoClose": false, "closeOnClick": false, "maxWidth": 450});
 
 
-            
-                var html_ = $(`<div id="html_" style="width: 100.0%; height: 100.0%;"><p>Cluster: 1 / 2</br>Cluster points: 5</br>Cluster diameter: 4.47 km (2.78 miles)</br></p></div>`)[0];
-                popup_.setContent(html_);
-            
+            var html_ = $(`<div id="html_" style="width: 100.0%; height: 100.0%;"><p>Cluster: 1 / 2</br>Cluster points: 5</br>Cluster diameter: 4.47 km (2.78 miles)</br></p></div>`)[0];
+            popup_.setContent(html_);
 
 
         polygon_.bindPopup(popup_)
@@ -154,13 +134,10 @@
 
 
 
-            feature_group_.addTo(map_);
-        
-    
-            var layer_control__layers = {
+            var layer_control_ = {
                 base_layers : {
                     "cartodbpositron" : tile_layer_,
-                    "cartodbdarkmatter" : tile_layer_,
+                    "cartodbdark_matter" : tile_layer_,
                     "openstreetmap" : tile_layer_,
                     "DarkMatter no labels" : tile_layer_,
                 },
@@ -169,12 +146,14 @@
                     "Cluster 2" : feature_group_,
                 },
             };
-            let layer_control_ = L.control.layers(
-                layer_control__layers.base_layers,
-                layer_control__layers.overlays,
+            L.control.layers(
+                layer_control_.base_layers,
+                layer_control_.overlays,
                 {"autoZIndex": true, "collapsed": true, "position": "topright"}
             ).addTo(map_);
-
+            tile_layer_.remove();
+            tile_layer_.remove();
+            tile_layer_.remove();
 
 </script>
 </html>