Skip to content

Commit 872d5ac

Browse files
authored
fix: Bump python & javascript dependencies (#9827)
* Update Python dependencies: - google-auth-oauthlib 1.3.0 → 1.3.1 - sphinxcontrib-youtube 1.4.1 → 1.5.0 - fixtures 4.3.1 → 4.3.2 - Add missing newline at end of requirements files * Update JavaScript dependencies: - Replace deprecated @babel/plugin-proposal-* packages with @babel/plugin-transform-* equivalents - Remove unused @types/classnames dependency - Update yarn.lock - Pin the 'react-frame-component' to '~5.2.6' * fix: Use PostGIS 36 for EPAS 18 in CI workflow - EPAS 18 ships with edb-as18-postgis36 instead of postgis34. - Add a postgisver matrix variable to support mixed versions. - Add exclude+include for EPAS 18 PostGIS matrix to fix empty runs-on * Moving '@babel/plugin-transform-class-properties', '@babel/preset-react' to devDependencies section
1 parent d59fcf3 commit 872d5ac

File tree

10 files changed

+354
-402
lines changed

10 files changed

+354
-402
lines changed

.github/workflows/run-python-tests-epas.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@ jobs:
3333
matrix:
3434
os: [ubuntu-22.04, windows-latest]
3535
pgver: [14, 15, 16, 17, 18]
36+
postgisver: [34]
37+
exclude:
38+
- pgver: 18
39+
postgisver: 34
40+
include:
41+
- os: ubuntu-22.04
42+
pgver: 18
43+
postgisver: 36
44+
- os: windows-latest
45+
pgver: 18
46+
postgisver: 36
3647

3748
runs-on: ${{ matrix.os }}
3849

@@ -53,7 +64,7 @@ jobs:
5364
if: ${{ matrix.os == 'ubuntu-22.04' }}
5465
run: |
5566
sudo apt update
56-
sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-postgis34
67+
sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-postgis${{ matrix.postgisver }}
5768
5869
- name: Install pgagent on Linux
5970
if: ${{ matrix.os == 'ubuntu-22.04' && matrix.pgver <= 16 }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@ auditpy.txt
5959
web/coverage/
6060
web/.coverage
6161
web/regression/.coverage
62+
.worktree/
6263
web/regression/covhtml/
6364
web/regression/htmlcov/

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Flask-SQLAlchemy==3.1.*
3434
Flask-WTF==1.2.*
3535
Flask==3.1.*
3636
google-api-python-client==2.*
37-
google-auth-oauthlib==1.3.0
37+
google-auth-oauthlib==1.3.1
3838
gssapi==1.11.*
3939
jsonformatter~=0.3.4
4040
keyring==25.*
@@ -62,4 +62,4 @@ urllib3==2.6.*; python_version > '3.9'
6262
user-agents==2.2.0
6363
Werkzeug==3.1.*
6464
WTForms==3.1.*; python_version <= '3.9'
65-
WTForms==3.2.*; python_version > '3.9'
65+
WTForms==3.2.*; python_version > '3.9'

tools/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ requests>=2.21.0
22
requests[security]>=2.21.0
33
safety>=1.9.0
44
Sphinx==7.4.7
5-
sphinxcontrib-youtube==1.4.1
5+
sphinxcontrib-youtube==1.5.0

web/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = [
4242
'babelOptions': {
4343
'plugins': [
4444
'@babel/plugin-syntax-jsx',
45-
'@babel/plugin-proposal-class-properties',
45+
'@babel/plugin-transform-class-properties',
4646
],
4747
},
4848
...reactjs.configs.recommended.parserOptions,

web/babel.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"presets": [["@babel/preset-env", {"modules": "commonjs", "useBuiltIns": "usage", "corejs": 3}], ["@babel/preset-react", {
33
"runtime": "automatic"
44
}], "@babel/preset-typescript"],
5-
"plugins": ["@babel/plugin-proposal-class-properties", "@babel/proposal-object-rest-spread"]
5+
"plugins": ["@babel/plugin-transform-class-properties", "@babel/plugin-transform-object-rest-spread"]
66
}

web/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
"@babel/core": "^7.28.3",
1111
"@babel/eslint-parser": "^7.28.6",
1212
"@babel/eslint-plugin": "^7.26.10",
13-
"@babel/plugin-proposal-object-rest-spread": "^7.10.1",
1413
"@babel/plugin-syntax-jsx": "^7.16.0",
14+
"@babel/plugin-transform-class-properties": "^7.28.6",
15+
"@babel/plugin-transform-object-rest-spread": "^7.28.6",
16+
"@babel/preset-react": "^7.27.1",
1517
"@babel/plugin-transform-runtime": "^7.28.3",
1618
"@babel/preset-env": "^7.29.0",
1719
"@babel/preset-typescript": "^7.24.7",
@@ -70,8 +72,6 @@
7072
"sharp": "^0.34.4"
7173
},
7274
"dependencies": {
73-
"@babel/plugin-proposal-class-properties": "^7.10.4",
74-
"@babel/preset-react": "^7.27.1",
7575
"@codemirror/lang-json": "^6.0.1",
7676
"@codemirror/lang-sql": "^6.10.0",
7777
"@date-io/core": "^3.0.0",
@@ -89,7 +89,6 @@
8989
"@tanstack/react-query": "^5.90.19",
9090
"@tanstack/react-table": "^8.16.0",
9191
"@tanstack/react-virtual": "^3.13.21",
92-
"@types/classnames": "^2.3.4",
9392
"@types/react": "^19.2.9",
9493
"@types/react-dom": "^19.0.0",
9594
"@xterm/addon-fit": "^0.11.0",
@@ -137,7 +136,7 @@
137136
"react-dom": "^19.2.3",
138137
"react-draggable": "^4.4.6",
139138
"react-dropzone": "^15.0.0",
140-
"react-frame-component": "^5.2.6",
139+
"react-frame-component": "~5.2.6",
141140
"react-leaflet": "^4.2.1",
142141
"react-new-window": "^1.0.1",
143142
"react-resize-detector": "^12.3.0",

web/regression/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# relevant packages.
2323
###########################################################
2424
extras==1.0.0
25-
fixtures==4.3.1
25+
fixtures==4.3.2
2626
linecache2==1.0.0
2727
pbr==7.0.3
2828
pycodestyle>=2.5.0

web/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module.exports = [{
143143
presets: [['@babel/preset-env', {'modules': 'commonjs', 'useBuiltIns': 'usage', 'corejs': 3}], ['@babel/preset-react', {
144144
'runtime': 'automatic'
145145
}], '@babel/preset-typescript'],
146-
plugins: ['@babel/plugin-proposal-class-properties', '@babel/proposal-object-rest-spread'],
146+
plugins: ['@babel/plugin-transform-class-properties', '@babel/plugin-transform-object-rest-spread'],
147147
},
148148
},
149149
}, {

0 commit comments

Comments
 (0)