Skip to content

Commit 9b7c8c4

Browse files
koettertkoettert
authored
Merge pull request #411 from spatial-data-lab/3841-update-dependencies-to-latest-version
Update All Dependencies to latest supported versions especially Geopandas to version 1.1.1
2 parents 5de0014 + 9ae277e commit 9b7c8c4

20 files changed

+17333
-413
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ config_*.yml
77
tests/test.html
88
tests/test.ipynb
99
tests/*.ipynb
10+
11+
# pixi environments
12+
.pixi
13+
*.egg-info
14+
local-update-site

‎knime_extension/geospatial_env.yml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,34 @@ channels:
44
- conda-forge
55
dependencies:
66
- packaging
7-
- python=3.9
8-
- curl=8.1.2 #required by libgdal which includes an older version with vulnerabilities
7+
- python=3.11
8+
- curl=8.14.0
99
- cvxopt=1.3.2
10-
- esda=2.5.0
11-
- fiona=1.9.3
12-
- folium=0.14.0
13-
- geopandas=0.14.4
14-
- geopy=2.4.0
15-
- h3-py=3.7.7
16-
- ipykernel=6.22.0 #required by kepler but not included in its dependencies it seems
10+
- esda=2.7.0
11+
- fiona=1.10.1 # install pyogrio=0.11.0
12+
- folium=0.19.6
13+
- geopandas=1.1.0
14+
- geopy=2.4.1
15+
- h3-py=4.2.2
1716
- jmespath=1.0.1
18-
- keplergl=0.3.2
1917
- knime-extension
2018
- knime-python-base
21-
- libgdal=3.6.3
22-
- libpysal=4.8.0
23-
- mgwr=2.1.2
24-
- numpy=1.23.5 #required to fix problem with latest version of numpy
25-
- osmnx=1.7.0
26-
- polyline 2.0.0
27-
- pyogrio=0.10.0
28-
- pyproj=3.5.0
29-
- pysal=23.1
30-
- rasterio=1.3.6
31-
- seaborn=0.12.2
32-
- shapely=2.0.1
33-
- sympy=1.12.0
34-
- pip=23.2.1
35-
- pygeoda=0.0.8
36-
- pointpats=2.3.0
19+
- libgdal=3.10.3
20+
- libpysal=4.13
21+
- mgwr=2.2.1
22+
- numpy=1.26.4
23+
- osmnx=2.0.3
24+
- polyline=2.0.2
25+
- pyproj=3.7.1
26+
- pysal=25.1
27+
- rasterio=1.4.3
28+
- seaborn=0.13.2
29+
- shapely=2.1.1
30+
- sympy=1.14.0
31+
- pip=25.1.1
32+
- pygeoda= 0.1.2
33+
- pointpats=2.5.1
3734
- pip:
38-
- ipinfo==4.4.3
39-
- pulp==2.7.0
35+
- ipinfo==5.1.1
36+
- pulp==3.2.1
37+
- keplergl==0.3.7 # install ipykernel

‎knime_extension/knime.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ author: Lingbo Liu,Xiaokang Fu,Tobias Koetter
44
vendor: SDL, Harvard, Cambridge US
55
description: Geospatial Analytics Extension for KNIME # Human readable bundle name / description
66
long_description: KNIME nodes for processing, analyzing and visualizing Geospatial data.
7-
version: 1.4.0 # Version of this Python node extension
7+
version: 2.0.0 # Version of this Python node extension
88
license_file: LICENSE.TXT # Best practice: put your LICENSE.TXT next to the knime.yml; otherwise you would need to change to path/to/LICENSE.txt
99
extension_module: src/geospatial_ext # The .py Python module containing the nodes of your extension
10-
env_yml_path: geospatial_env.yml # This is necessary for bundling, but not needed during development
11-
feature_dependencies:
10+
pixi_toml_path: pixi.toml # This is necessary for bundling, but not needed during development
11+
feature_dependencies:
1212
- org.knime.features.geospatial 4.7.0
13-
- org.knime.features.core 5.3.0 #ensure that this extension can only be used with 5.3 with file browsing support
13+
- org.knime.features.core 5.5.0 #ensure that this extension can only be used with 5.5 that uses Pixi
1414

‎knime_extension/libs/kepler/2.5.5/maplibre-gl.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎knime_extension/libs/kepler/2.5.5/maplibre-gl.js

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎knime_extension/libs/leaflet/1.9.3/bootstrap-glyphicons.css

Lines changed: 263 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,263 @@
1+
/*!
2+
* Bootstrap v3.0.0
3+
*
4+
* Copyright 2013 Twitter, Inc
5+
* Licensed under the Apache License v2.0
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9+
*/
10+
11+
12+
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block;}
13+
audio,canvas,video{display:inline-block;}
14+
audio:not([controls]){display:none;height:0;}
15+
[hidden]{display:none;}
16+
html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
17+
body{margin:0;}
18+
a:focus{outline:thin dotted;}
19+
a:active,a:hover{outline:0;}
20+
h1{font-size:2em;margin:0.67em 0;}
21+
abbr[title]{border-bottom:1px dotted;}
22+
b,strong{font-weight:bold;}
23+
dfn{font-style:italic;}
24+
hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0;}
25+
mark{background:#ff0;color:#000;}
26+
code,kbd,pre,samp{font-family:monospace, serif;font-size:1em;}
27+
pre{white-space:pre-wrap;}
28+
q{quotes:"\201C" "\201D" "\2018" "\2019";}
29+
small{font-size:80%;}
30+
sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
31+
sup{top:-0.5em;}
32+
sub{bottom:-0.25em;}
33+
img{border:0;}
34+
svg:not(:root){overflow:hidden;}
35+
figure{margin:0;}
36+
fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}
37+
legend{border:0;padding:0;}
38+
button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;}
39+
button,input{line-height:normal;}
40+
button,select{text-transform:none;}
41+
button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}
42+
button[disabled],html input[disabled]{cursor:default;}
43+
input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;}
44+
input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}
45+
input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
46+
button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
47+
textarea{overflow:auto;vertical-align:top;}
48+
table{border-collapse:collapse;border-spacing:0;}
49+
*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
50+
html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);}
51+
body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333333;background-color:#ffffff;}
52+
input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit;}
53+
button,input,select[multiple],textarea{background-image:none;}
54+
a{color:#428bca;text-decoration:none;}a:hover,a:focus{color:#2a6496;text-decoration:underline;}
55+
a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
56+
img{vertical-align:middle;}
57+
.img-responsive{display:block;max-width:100%;height:auto;}
58+
.img-rounded{border-radius:6px;}
59+
.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#ffffff;border:1px solid #dddddd;border-radius:4px;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;display:inline-block;max-width:100%;height:auto;}
60+
.img-circle{border-radius:50%;}
61+
hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eeeeee;}
62+
.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0;}
63+
@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;}
64+
.glyphicon-asterisk:before{content:"\2a";}
65+
.glyphicon-plus:before{content:"\2b";}
66+
.glyphicon-euro:before{content:"\20ac";}
67+
.glyphicon-minus:before{content:"\2212";}
68+
.glyphicon-cloud:before{content:"\2601";}
69+
.glyphicon-envelope:before{content:"\2709";}
70+
.glyphicon-pencil:before{content:"\270f";}
71+
.glyphicon-glass:before{content:"\e001";}
72+
.glyphicon-music:before{content:"\e002";}
73+
.glyphicon-search:before{content:"\e003";}
74+
.glyphicon-heart:before{content:"\e005";}
75+
.glyphicon-star:before{content:"\e006";}
76+
.glyphicon-star-empty:before{content:"\e007";}
77+
.glyphicon-user:before{content:"\e008";}
78+
.glyphicon-film:before{content:"\e009";}
79+
.glyphicon-th-large:before{content:"\e010";}
80+
.glyphicon-th:before{content:"\e011";}
81+
.glyphicon-th-list:before{content:"\e012";}
82+
.glyphicon-ok:before{content:"\e013";}
83+
.glyphicon-remove:before{content:"\e014";}
84+
.glyphicon-zoom-in:before{content:"\e015";}
85+
.glyphicon-zoom-out:before{content:"\e016";}
86+
.glyphicon-off:before{content:"\e017";}
87+
.glyphicon-signal:before{content:"\e018";}
88+
.glyphicon-cog:before{content:"\e019";}
89+
.glyphicon-trash:before{content:"\e020";}
90+
.glyphicon-home:before{content:"\e021";}
91+
.glyphicon-file:before{content:"\e022";}
92+
.glyphicon-time:before{content:"\e023";}
93+
.glyphicon-road:before{content:"\e024";}
94+
.glyphicon-download-alt:before{content:"\e025";}
95+
.glyphicon-download:before{content:"\e026";}
96+
.glyphicon-upload:before{content:"\e027";}
97+
.glyphicon-inbox:before{content:"\e028";}
98+
.glyphicon-play-circle:before{content:"\e029";}
99+
.glyphicon-repeat:before{content:"\e030";}
100+
.glyphicon-refresh:before{content:"\e031";}
101+
.glyphicon-list-alt:before{content:"\e032";}
102+
.glyphicon-flag:before{content:"\e034";}
103+
.glyphicon-headphones:before{content:"\e035";}
104+
.glyphicon-volume-off:before{content:"\e036";}
105+
.glyphicon-volume-down:before{content:"\e037";}
106+
.glyphicon-volume-up:before{content:"\e038";}
107+
.glyphicon-qrcode:before{content:"\e039";}
108+
.glyphicon-barcode:before{content:"\e040";}
109+
.glyphicon-tag:before{content:"\e041";}
110+
.glyphicon-tags:before{content:"\e042";}
111+
.glyphicon-book:before{content:"\e043";}
112+
.glyphicon-print:before{content:"\e045";}
113+
.glyphicon-font:before{content:"\e047";}
114+
.glyphicon-bold:before{content:"\e048";}
115+
.glyphicon-italic:before{content:"\e049";}
116+
.glyphicon-text-height:before{content:"\e050";}
117+
.glyphicon-text-width:before{content:"\e051";}
118+
.glyphicon-align-left:before{content:"\e052";}
119+
.glyphicon-align-center:before{content:"\e053";}
120+
.glyphicon-align-right:before{content:"\e054";}
121+
.glyphicon-align-justify:before{content:"\e055";}
122+
.glyphicon-list:before{content:"\e056";}
123+
.glyphicon-indent-left:before{content:"\e057";}
124+
.glyphicon-indent-right:before{content:"\e058";}
125+
.glyphicon-facetime-video:before{content:"\e059";}
126+
.glyphicon-picture:before{content:"\e060";}
127+
.glyphicon-map-marker:before{content:"\e062";}
128+
.glyphicon-adjust:before{content:"\e063";}
129+
.glyphicon-tint:before{content:"\e064";}
130+
.glyphicon-edit:before{content:"\e065";}
131+
.glyphicon-share:before{content:"\e066";}
132+
.glyphicon-check:before{content:"\e067";}
133+
.glyphicon-move:before{content:"\e068";}
134+
.glyphicon-step-backward:before{content:"\e069";}
135+
.glyphicon-fast-backward:before{content:"\e070";}
136+
.glyphicon-backward:before{content:"\e071";}
137+
.glyphicon-play:before{content:"\e072";}
138+
.glyphicon-pause:before{content:"\e073";}
139+
.glyphicon-stop:before{content:"\e074";}
140+
.glyphicon-forward:before{content:"\e075";}
141+
.glyphicon-fast-forward:before{content:"\e076";}
142+
.glyphicon-step-forward:before{content:"\e077";}
143+
.glyphicon-eject:before{content:"\e078";}
144+
.glyphicon-chevron-left:before{content:"\e079";}
145+
.glyphicon-chevron-right:before{content:"\e080";}
146+
.glyphicon-plus-sign:before{content:"\e081";}
147+
.glyphicon-minus-sign:before{content:"\e082";}
148+
.glyphicon-remove-sign:before{content:"\e083";}
149+
.glyphicon-ok-sign:before{content:"\e084";}
150+
.glyphicon-question-sign:before{content:"\e085";}
151+
.glyphicon-info-sign:before{content:"\e086";}
152+
.glyphicon-screenshot:before{content:"\e087";}
153+
.glyphicon-remove-circle:before{content:"\e088";}
154+
.glyphicon-ok-circle:before{content:"\e089";}
155+
.glyphicon-ban-circle:before{content:"\e090";}
156+
.glyphicon-arrow-left:before{content:"\e091";}
157+
.glyphicon-arrow-right:before{content:"\e092";}
158+
.glyphicon-arrow-up:before{content:"\e093";}
159+
.glyphicon-arrow-down:before{content:"\e094";}
160+
.glyphicon-share-alt:before{content:"\e095";}
161+
.glyphicon-resize-full:before{content:"\e096";}
162+
.glyphicon-resize-small:before{content:"\e097";}
163+
.glyphicon-exclamation-sign:before{content:"\e101";}
164+
.glyphicon-gift:before{content:"\e102";}
165+
.glyphicon-leaf:before{content:"\e103";}
166+
.glyphicon-eye-open:before{content:"\e105";}
167+
.glyphicon-eye-close:before{content:"\e106";}
168+
.glyphicon-warning-sign:before{content:"\e107";}
169+
.glyphicon-plane:before{content:"\e108";}
170+
.glyphicon-random:before{content:"\e110";}
171+
.glyphicon-comment:before{content:"\e111";}
172+
.glyphicon-magnet:before{content:"\e112";}
173+
.glyphicon-chevron-up:before{content:"\e113";}
174+
.glyphicon-chevron-down:before{content:"\e114";}
175+
.glyphicon-retweet:before{content:"\e115";}
176+
.glyphicon-shopping-cart:before{content:"\e116";}
177+
.glyphicon-folder-close:before{content:"\e117";}
178+
.glyphicon-folder-open:before{content:"\e118";}
179+
.glyphicon-resize-vertical:before{content:"\e119";}
180+
.glyphicon-resize-horizontal:before{content:"\e120";}
181+
.glyphicon-hdd:before{content:"\e121";}
182+
.glyphicon-bullhorn:before{content:"\e122";}
183+
.glyphicon-certificate:before{content:"\e124";}
184+
.glyphicon-thumbs-up:before{content:"\e125";}
185+
.glyphicon-thumbs-down:before{content:"\e126";}
186+
.glyphicon-hand-right:before{content:"\e127";}
187+
.glyphicon-hand-left:before{content:"\e128";}
188+
.glyphicon-hand-up:before{content:"\e129";}
189+
.glyphicon-hand-down:before{content:"\e130";}
190+
.glyphicon-circle-arrow-right:before{content:"\e131";}
191+
.glyphicon-circle-arrow-left:before{content:"\e132";}
192+
.glyphicon-circle-arrow-up:before{content:"\e133";}
193+
.glyphicon-circle-arrow-down:before{content:"\e134";}
194+
.glyphicon-globe:before{content:"\e135";}
195+
.glyphicon-tasks:before{content:"\e137";}
196+
.glyphicon-filter:before{content:"\e138";}
197+
.glyphicon-fullscreen:before{content:"\e140";}
198+
.glyphicon-dashboard:before{content:"\e141";}
199+
.glyphicon-heart-empty:before{content:"\e143";}
200+
.glyphicon-link:before{content:"\e144";}
201+
.glyphicon-phone:before{content:"\e145";}
202+
.glyphicon-usd:before{content:"\e148";}
203+
.glyphicon-gbp:before{content:"\e149";}
204+
.glyphicon-sort:before{content:"\e150";}
205+
.glyphicon-sort-by-alphabet:before{content:"\e151";}
206+
.glyphicon-sort-by-alphabet-alt:before{content:"\e152";}
207+
.glyphicon-sort-by-order:before{content:"\e153";}
208+
.glyphicon-sort-by-order-alt:before{content:"\e154";}
209+
.glyphicon-sort-by-attributes:before{content:"\e155";}
210+
.glyphicon-sort-by-attributes-alt:before{content:"\e156";}
211+
.glyphicon-unchecked:before{content:"\e157";}
212+
.glyphicon-expand:before{content:"\e158";}
213+
.glyphicon-collapse-down:before{content:"\e159";}
214+
.glyphicon-collapse-up:before{content:"\e160";}
215+
.glyphicon-log-in:before{content:"\e161";}
216+
.glyphicon-flash:before{content:"\e162";}
217+
.glyphicon-log-out:before{content:"\e163";}
218+
.glyphicon-new-window:before{content:"\e164";}
219+
.glyphicon-record:before{content:"\e165";}
220+
.glyphicon-save:before{content:"\e166";}
221+
.glyphicon-open:before{content:"\e167";}
222+
.glyphicon-saved:before{content:"\e168";}
223+
.glyphicon-import:before{content:"\e169";}
224+
.glyphicon-export:before{content:"\e170";}
225+
.glyphicon-send:before{content:"\e171";}
226+
.glyphicon-floppy-disk:before{content:"\e172";}
227+
.glyphicon-floppy-saved:before{content:"\e173";}
228+
.glyphicon-floppy-remove:before{content:"\e174";}
229+
.glyphicon-floppy-save:before{content:"\e175";}
230+
.glyphicon-floppy-open:before{content:"\e176";}
231+
.glyphicon-credit-card:before{content:"\e177";}
232+
.glyphicon-transfer:before{content:"\e178";}
233+
.glyphicon-cutlery:before{content:"\e179";}
234+
.glyphicon-header:before{content:"\e180";}
235+
.glyphicon-compressed:before{content:"\e181";}
236+
.glyphicon-earphone:before{content:"\e182";}
237+
.glyphicon-phone-alt:before{content:"\e183";}
238+
.glyphicon-tower:before{content:"\e184";}
239+
.glyphicon-stats:before{content:"\e185";}
240+
.glyphicon-sd-video:before{content:"\e186";}
241+
.glyphicon-hd-video:before{content:"\e187";}
242+
.glyphicon-subtitles:before{content:"\e188";}
243+
.glyphicon-sound-stereo:before{content:"\e189";}
244+
.glyphicon-sound-dolby:before{content:"\e190";}
245+
.glyphicon-sound-5-1:before{content:"\e191";}
246+
.glyphicon-sound-6-1:before{content:"\e192";}
247+
.glyphicon-sound-7-1:before{content:"\e193";}
248+
.glyphicon-copyright-mark:before{content:"\e194";}
249+
.glyphicon-registration-mark:before{content:"\e195";}
250+
.glyphicon-cloud-download:before{content:"\e197";}
251+
.glyphicon-cloud-upload:before{content:"\e198";}
252+
.glyphicon-tree-conifer:before{content:"\e199";}
253+
.glyphicon-tree-deciduous:before{content:"\e200";}
254+
.glyphicon-briefcase:before{content:"\1f4bc";}
255+
.glyphicon-calendar:before{content:"\1f4c5";}
256+
.glyphicon-pushpin:before{content:"\1f4cc";}
257+
.glyphicon-paperclip:before{content:"\1f4ce";}
258+
.glyphicon-camera:before{content:"\1f4f7";}
259+
.glyphicon-lock:before{content:"\1f512";}
260+
.glyphicon-bell:before{content:"\1f514";}
261+
.glyphicon-bookmark:before{content:"\1f516";}
262+
.glyphicon-fire:before{content:"\1f525";}
263+
.glyphicon-wrench:before{content:"\1f527";}

‎knime_extension/libs/leaflet/1.9.3/jquery-3.7.1.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)