Skip to content

Commit 1c7286d

Browse files
authored
Merge pull request #873 from mendix/develop
Release 2025-09-18
2 parents f97b88c + 7de55a6 commit 1c7286d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+101
-2147
lines changed

bin/bootstrap-python

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ then
5151
if [[ -n "${PIP_WHL_PATH}" ]]
5252
then
5353
# Bootstrap wheels are bundled in the buildpack
54-
python3 ${PIP_WHL_PATH}/pip install $PIP_VERBOSITY_FLAGS --user --no-warn-script-location --no-index --find-links=$PIP_WHEELDIR pip setuptools wheel
54+
python3 ${PIP_WHL_PATH}/pip install $PIP_VERBOSITY_FLAGS --user --no-warn-script-location --no-index --no-build-isolation --find-links=$PIP_WHEELDIR --use-pep517 pip setuptools wheel
5555
else
5656
# Bootstrap wheels are not bundled in the buildpack
5757
curl -sS https://bootstrap.pypa.io/pip/get-pip.py -o get-pip.py
@@ -63,7 +63,7 @@ else
6363
if [ "$CF_STACK" == "cflinuxfs4" ]; then
6464
PIP_CMD="python3 $(dirname "$(command -v python3)")/pip3"
6565
fi
66-
$PIP_CMD install --upgrade --user --no-warn-script-location pip setuptools wheel
66+
$PIP_CMD install --upgrade --user --no-warn-script-location --use-pep517 pip setuptools wheel
6767
fi
6868

6969
# Only download Python dependencies if they are not bundled
@@ -72,9 +72,9 @@ then
7272
echo " ---> Using bundled Python dependencies"
7373
else
7474
echo " ---> Downloading Python dependencies..."
75-
$PIP_CMD download $PIP_VERBOSITY_FLAGS -r $REQUIREMENTS_PATH --prefer-binary -d $PIP_WHEELDIR
75+
$PIP_CMD download $PIP_VERBOSITY_FLAGS --use-pep517 -r $REQUIREMENTS_PATH --prefer-binary -d $PIP_WHEELDIR
7676
fi
7777

7878
echo " ---> Installing Python dependencies to ${SITE_PACKAGES_PATH}..."
79-
$PIP_CMD install $PIP_VERBOSITY_FLAGS --target $SITE_PACKAGES_PATH --prefer-binary --no-warn-script-location --no-index --find-links=$PIP_WHEELDIR -r $REQUIREMENTS_PATH
79+
$PIP_CMD install $PIP_VERBOSITY_FLAGS --target $SITE_PACKAGES_PATH --prefer-binary --no-warn-script-location --no-index --no-build-isolation --find-links=$PIP_WHEELDIR --use-pep517 -r $REQUIREMENTS_PATH
8080
echo " ---> Finished installing Python dependencies"

buildpack/core/nginx.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
"X-Permitted-Cross-Domain-Policies": r"(?i)(^all$|^none$|^master-only$|^by-content-type$|^by-ftp-filename$)", # noqa: C0301
2424
"Origin-Trial": r"[a-zA-Z0-9:;/''\"\*_\- \.\n?=%&+]+",
2525
"X-XSS-Protection": r"(?i)(^0$|^1$|^1; mode=block$|^1; report=https?://([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*(:\d+)?$)", # noqa: C0301
26+
"Cross-Origin-Resource-Policy": r"(?i)(^same-origin$|^same-site$|^cross-origin$)",
27+
"Cross-Origin-Opener-Policy": r"(?i)(^unsafe-none$|^same-origin$|^same-origin-allow-popups$|^noopener-allow-popups$)",
28+
"Cross-Origin-Embedder-Policy": r"(?i)(^unsafe-none$|^require-corp$|^credentialless$)",
29+
"Clear-Site-Data": r"(?i)(^cache$|^cookies$|^storage$|^executionContexts$|^prefetchCache$|^prerenderCache$)",
2630
}
2731

2832
CONFIG_FILE = "nginx/conf/nginx.conf"

buildpack/databroker/__init__.py

Lines changed: 0 additions & 203 deletions
This file was deleted.

buildpack/databroker/config_generator/scripts/__init__.py

Whitespace-only changes.

buildpack/databroker/config_generator/scripts/config_env_whitelist.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

buildpack/databroker/config_generator/scripts/configloader/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)