Skip to content

Commit 4b5388b

Browse files
BotellaABotellaA
authored
Merge pull request #237 from Geode-solutions/fix/update-microservices
fix(Actions): update microservices
2 parents 999abb8 + e86d131 commit 4b5388b

File tree

9 files changed

+24
-179
lines changed

9 files changed

+24
-179
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"is-electron": "2.2.2",
5757
"js-file-download": "0.4.12",
5858
"nuxt": "3.13.2",
59-
"pidtree": "0.6.0",
6059
"pinia": "3.0.3",
6160
"sass": "1.87.0",
6261
"semver": "7.7.1",
62+
"tree-kill": "1.2.2",
6363
"uuid": "11.1.0",
6464
"vue-recaptcha": "2.0.3",
6565
"vue3-carousel": "0.3.4",
@@ -83,4 +83,4 @@
8383
"publishConfig": {
8484
"access": "public"
8585
}
86-
}
86+
}

‎tests/integration/microservices/back/requirements-internal.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
opengeodeweb-back

‎tests/integration/microservices/back/requirements.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
OpenGeodeWeb-Back

‎tests/integration/microservices/back/requirements.txt‎

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2,74 +2,5 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile requirements.in
5+
# pip-compile --output-file=tests/integration/microservices/back/requirements.txt --pre tests/integration/microservices/back/requirements.in
66
#
7-
asgiref==3.9.1
8-
# via
9-
# flask
10-
# opengeodeweb-back
11-
blinker==1.9.0
12-
# via
13-
# flask
14-
# opengeodeweb-back
15-
click==8.2.1
16-
# via
17-
# flask
18-
# opengeodeweb-back
19-
fastjsonschema==2.16.2
20-
# via opengeodeweb-back
21-
flask[async]==3.0.3
22-
# via
23-
# flask-cors
24-
# opengeodeweb-back
25-
flask-cors==6.0.1
26-
# via opengeodeweb-back
27-
geode-common==33.9.0
28-
# via
29-
# geode-viewables
30-
# opengeodeweb-back
31-
geode-viewables==3.2.0
32-
# via opengeodeweb-back
33-
itsdangerous==2.2.0
34-
# via
35-
# flask
36-
# opengeodeweb-back
37-
jinja2==3.1.6
38-
# via
39-
# flask
40-
# opengeodeweb-back
41-
markupsafe==3.0.2
42-
# via
43-
# jinja2
44-
# opengeodeweb-back
45-
# werkzeug
46-
opengeode-core==15.24.2
47-
# via
48-
# geode-common
49-
# geode-viewables
50-
# opengeode-geosciences
51-
# opengeode-geosciencesio
52-
# opengeode-inspector
53-
# opengeode-io
54-
# opengeodeweb-back
55-
opengeode-geosciences==9.2.2
56-
# via
57-
# geode-viewables
58-
# opengeode-geosciencesio
59-
# opengeodeweb-back
60-
opengeode-geosciencesio==5.7.2
61-
# via opengeodeweb-back
62-
opengeode-inspector==6.7.0
63-
# via opengeodeweb-back
64-
opengeode-io==7.3.2
65-
# via
66-
# geode-viewables
67-
# opengeode-geosciencesio
68-
# opengeodeweb-back
69-
opengeodeweb-back==5.9.1
70-
# via -r requirements.in
71-
werkzeug==3.0.3
72-
# via
73-
# flask
74-
# flask-cors
75-
# opengeodeweb-back

‎tests/integration/microservices/viewer/requirements-internal.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
opengeodeweb-viewer[cpu]

‎tests/integration/microservices/viewer/requirements.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
OpenGeodeWeb-Viewer[cpu]

‎tests/integration/microservices/viewer/requirements.txt‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,5 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --extra-index-url=https://wheels.vtk.org --pre requirements.in
5+
# pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt --pre tests/integration/microservices/viewer/requirements.in
66
#
7-
--extra-index-url https://wheels.vtk.org
8-
9-
aiohappyeyeballs==2.6.1
10-
# via
11-
# aiohttp
12-
# opengeodeweb-viewer
13-
aiohttp==3.12.15
14-
# via
15-
# opengeodeweb-viewer
16-
# wslink
17-
aiosignal==1.4.0
18-
# via
19-
# aiohttp
20-
# opengeodeweb-viewer
21-
attrs==25.3.0
22-
# via
23-
# aiohttp
24-
# opengeodeweb-viewer
25-
contourpy==1.3.3
26-
# via matplotlib
27-
cycler==0.12.1
28-
# via matplotlib
29-
fastjsonschema==2.21.1
30-
# via opengeodeweb-viewer
31-
fonttools==4.59.2
32-
# via matplotlib
33-
frozenlist==1.7.0
34-
# via
35-
# aiohttp
36-
# aiosignal
37-
# opengeodeweb-viewer
38-
idna==3.10
39-
# via
40-
# opengeodeweb-viewer
41-
# yarl
42-
kiwisolver==1.4.10rc0
43-
# via matplotlib
44-
matplotlib==3.10.6
45-
# via vtk-osmesa
46-
multidict==6.6.3
47-
# via
48-
# aiohttp
49-
# opengeodeweb-viewer
50-
# yarl
51-
numpy==2.3.2
52-
# via
53-
# contourpy
54-
# matplotlib
55-
opengeodeweb-viewer[cpu]==1.11.0rc3
56-
# via
57-
# -r requirements.in
58-
# opengeodeweb-viewer
59-
packaging==25.0
60-
# via matplotlib
61-
pillow==11.3.0
62-
# via matplotlib
63-
propcache==0.3.2
64-
# via
65-
# aiohttp
66-
# opengeodeweb-viewer
67-
# yarl
68-
pyparsing==3.2.3
69-
# via matplotlib
70-
python-dateutil==2.9.0.post0
71-
# via matplotlib
72-
six==1.17.0
73-
# via python-dateutil
74-
typing-extensions==4.14.1
75-
# via
76-
# aiosignal
77-
# opengeodeweb-viewer
78-
vtk-osmesa==9.3.1
79-
# via opengeodeweb-viewer
80-
websocket-client==1.8.0
81-
# via opengeodeweb-viewer
82-
wslink==1.12.4
83-
# via opengeodeweb-viewer
84-
yarl==1.20.1
85-
# via
86-
# aiohttp
87-
# opengeodeweb-viewer

‎utils/local.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import child_process from "child_process"
77
import pkg from "electron"
88
const { app, dialog } = pkg
99
import { getPort } from "get-port-please"
10-
import pidtree from "pidtree"
10+
import kill from "tree-kill"
1111
import isElectron from "is-electron"
1212

1313
import { fileURLToPath } from "url"
@@ -71,18 +71,17 @@ async function kill_processes() {
7171
await processes.forEach(async function (proc) {
7272
console.log(`Process ${proc} will be killed!`)
7373
try {
74-
process.kill(proc)
74+
kill(proc)
7575
} catch (error) {
7676
console.log(`${error} Process ${proc} could not be killed!`)
7777
}
7878
})
7979
}
8080

81-
function register_children_processes(proc) {
82-
pidtree(proc.pid, { root: true }, function (err, pids) {
83-
if (err) console.log("err", err)
84-
processes.push(...pids)
85-
})
81+
function register_process(proc) {
82+
if (!processes.includes(proc.pid)) {
83+
processes.push(proc.pid)
84+
}
8685
}
8786

8887
async function run_script(
@@ -99,7 +98,7 @@ async function run_script(
9998
encoding: "utf8",
10099
shell: true,
101100
})
102-
register_children_processes(child)
101+
register_process(child)
103102

104103
// You can also use a variable to save the output for when the script closes later
105104
child.stderr.setEncoding("utf8")
@@ -115,7 +114,6 @@ async function run_script(
115114
//Here is the output
116115
data = data.toString()
117116
if (data.includes(expected_response)) {
118-
register_children_processes(child)
119117
resolve(child)
120118
}
121119
console.log(data)
@@ -173,7 +171,7 @@ export {
173171
executable_path,
174172
get_available_port,
175173
kill_processes,
176-
register_children_processes,
174+
register_process,
177175
run_script,
178176
run_back,
179177
run_viewer,

0 commit comments

Comments
 (0)