From 99e1f005fc3144a773a2b006b5a20e5018429341 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Wed, 15 Jan 2025 13:44:34 +0530 Subject: [PATCH] Update Python version to 3.13 --- Dockerfile | 2 +- Make.bat | 2 +- pkg/mac/README.md | 4 ++-- pkg/mac/build.sh | 4 ++-- pkg/pip/setup_pip.py | 5 +++-- pkg/win32/README.md | 4 ++-- web/package.json | 2 +- web/yarn.lock | 20 ++++++++++---------- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7df83a8a..ea22e7eba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -218,7 +218,7 @@ RUN apk add --no-cache \ chown pgadmin:root /pgadmin4/config_distro.py && \ chmod g=u /pgadmin4/config_distro.py && \ chmod g=u /etc/passwd && \ - setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.12 && \ + setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.13 && \ echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \ echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix diff --git a/Make.bat b/Make.bat index 826dd5779..b7e4e6864 100644 --- a/Make.bat +++ b/Make.bat @@ -52,7 +52,7 @@ REM Main build sequence Ends :SET_ENVIRONMENT ECHO Configuring the environment... - IF "%PGADMIN_PYTHON_DIR%" == "" SET "PGADMIN_PYTHON_DIR=C:\Python312" + IF "%PGADMIN_PYTHON_DIR%" == "" SET "PGADMIN_PYTHON_DIR=C:\Python313" IF "%PGADMIN_KRB5_DIR%" == "" SET "PGADMIN_KRB5_DIR=C:\Program Files\MIT\Kerberos" IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files\PostgreSQL\17" IF "%PGADMIN_INNOTOOL_DIR%" == "" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6" diff --git a/pkg/mac/README.md b/pkg/mac/README.md index 868d119d8..97781d287 100644 --- a/pkg/mac/README.md +++ b/pkg/mac/README.md @@ -13,10 +13,10 @@ Either build the sources or get them from macports or similar: ## Building -1. To bundle a different version of Python from the default of 3.9.2, set the +1. To bundle a different version of Python from the default of 3.13.1, set the *PGADMIN_PYTHON_VERSION* environment variable, e.g: - export PGADMIN_PYTHON_VERSION=3.8.5 + export PGADMIN_PYTHON_VERSION=3.13.1 2. If a path different from the default of /usr/local/pgsql for the PostgreSQL installation has been used, set the *PGADMIN_POSTGRES_DIR* environment variable diff --git a/pkg/mac/build.sh b/pkg/mac/build.sh index ef0df97f2..5f29636a4 100755 --- a/pkg/mac/build.sh +++ b/pkg/mac/build.sh @@ -53,8 +53,8 @@ if [ "${PGADMIN_POSTGRES_DIR}" == "" ]; then fi if [ "${PGADMIN_PYTHON_VERSION}" == "" ]; then - echo "PGADMIN_PYTHON_VERSION not set. Setting it to the default: 3.11.2" - export PGADMIN_PYTHON_VERSION=3.11.2 + echo "PGADMIN_PYTHON_VERSION not set. Setting it to the default: 3.13.1" + export PGADMIN_PYTHON_VERSION=3.13.1 fi # shellcheck disable=SC1091 diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py index 838d43271..f2f26fce1 100644 --- a/pkg/pip/setup_pip.py +++ b/pkg/pip/setup_pip.py @@ -91,11 +91,12 @@ setup( 'Development Status :: 5 - Production/Stable', # Supported programming languages - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11' + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13' ], keywords='pgadmin4,postgresql,postgres', diff --git a/pkg/win32/README.md b/pkg/win32/README.md index 43791727d..8b86d9a7b 100644 --- a/pkg/win32/README.md +++ b/pkg/win32/README.md @@ -204,7 +204,7 @@ examples shown below are the defaults for the build system, so if they match your requirements you don't need to set them. For PostgreSQL 16 and below: SET "PGADMIN_POSTGRES_DIR=C:\build64\pgsql" - SET "PGADMIN_PYTHON_DIR=C:\Python312" + SET "PGADMIN_PYTHON_DIR=C:\Python313" SET "PGADMIN_KRB5_DIR=C:\build64\krb5" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64" @@ -214,7 +214,7 @@ your requirements you don't need to set them. For PostgreSQL 16 and below: For PostgreSQL 17 and later: SET "PGADMIN_POSTGRES_DIR=C:\build64" - SET "PGADMIN_PYTHON_DIR=C:\Python312" + SET "PGADMIN_PYTHON_DIR=C:\Python313" SET "PGADMIN_KRB5_DIR=C:\build64" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64" diff --git a/web/package.json b/web/package.json index eb435957c..61a9b9063 100644 --- a/web/package.json +++ b/web/package.json @@ -85,7 +85,7 @@ "@projectstorm/react-diagrams": "^7.0.4", "@simonwep/pickr": "^1.5.1", "@szhsin/react-menu": "^4.2.2", - "@tanstack/react-query": "5.64.0", + "@tanstack/react-query": "5.64.1", "@tanstack/react-table": "^8.16.0", "@tanstack/react-virtual": "^3.8.4", "@types/classnames": "^2.3.4", diff --git a/web/yarn.lock b/web/yarn.lock index 020e0d4af..3a8e05b93 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -3028,21 +3028,21 @@ __metadata: languageName: node linkType: hard -"@tanstack/query-core@npm:5.64.0": - version: 5.64.0 - resolution: "@tanstack/query-core@npm:5.64.0" - checksum: a489552af41419f9561baaff15073d63a4cf8634b5a9f4a484364a70734b6e37f7460560acccf61ef4b631ac4b6008000c4f13996b905f219b8099bd8343451c +"@tanstack/query-core@npm:5.64.1": + version: 5.64.1 + resolution: "@tanstack/query-core@npm:5.64.1" + checksum: cdead4a1589600c21a6a61d8cec8f54b2e806635d8c573972d4b2e448c66bc5c4b553eba366326d9346fe8e806f67f79e7973534904194b479a98dfa8231a453 languageName: node linkType: hard -"@tanstack/react-query@npm:5.64.0": - version: 5.64.0 - resolution: "@tanstack/react-query@npm:5.64.0" +"@tanstack/react-query@npm:5.64.1": + version: 5.64.1 + resolution: "@tanstack/react-query@npm:5.64.1" dependencies: - "@tanstack/query-core": 5.64.0 + "@tanstack/query-core": 5.64.1 peerDependencies: react: ^18 || ^19 - checksum: d6676fd1481753af1c348c8084057f9c879a8ac69c5cd5ae3f90ae29a6734a32511de90b2b02f9ac31da1ca475ecd72d2fb5e06d01dfa78c78d59919d32364d5 + checksum: 4272c7319c2805aadbe201ace10989c717828b1b7ed5d478edd28e28d0d3692afe0f712f5f0c8584c667c0d25fc8395d585d0056d315e57101acb7ab7062c862 languageName: node linkType: hard @@ -13590,7 +13590,7 @@ __metadata: "@simonwep/pickr": ^1.5.1 "@svgr/webpack": ^8.1.0 "@szhsin/react-menu": ^4.2.2 - "@tanstack/react-query": 5.64.0 + "@tanstack/react-query": 5.64.1 "@tanstack/react-table": ^8.16.0 "@tanstack/react-virtual": ^3.8.4 "@testing-library/dom": 10.4.0