Skip to content

Commit 5ec25e4

Browse files
authored
build: update protobuf version for 3.14 (cve) (#1824)
* minor protobuf version update for 3.14 * unique build name * fix build name * fix build name pt2 * fix build name pt3 * fix build name pt4 * my life * temporarily unblock running unit tests * hm?
1 parent 4dfe809 commit 5ec25e4

File tree

8 files changed

+27
-11
lines changed

8 files changed

+27
-11
lines changed

eng/ci/public-build.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,38 @@ extends:
5656
- template: /eng/templates/jobs/build.yml@self
5757
parameters:
5858
PYTHON_VERSION: '3.11'
59-
PROJECT_NAME: 'Azure Functions Python Worker'
59+
SIMPLE_VERSION: '311'
60+
PROJECT_NAME: 'Azure Functions Python Worker <= 3.12'
61+
PROJECT_DIRECTORY: 'workers'
62+
- template: /eng/templates/jobs/build.yml@self
63+
parameters:
64+
PYTHON_VERSION: '3.13'
65+
SIMPLE_VERSION: '313'
66+
PROJECT_NAME: 'Azure Functions Python Worker == 3.13'
67+
PROJECT_DIRECTORY: 'workers'
68+
- template: /eng/templates/jobs/build.yml@self
69+
parameters:
70+
PYTHON_VERSION: '3.14'
71+
SIMPLE_VERSION: '314'
72+
PROJECT_NAME: 'Azure Functions Python Worker == 3.14'
6073
PROJECT_DIRECTORY: 'workers'
6174
# Skip the build stage for SDK and Extensions release branches. This stage will fail because pyproject.toml contains the updated (and unreleased) library version
6275
condition: and(eq(variables.isSdkRelease, false), eq(variables.isExtensionsRelease, false), eq(variables['USETESTPYTHONSDK'], false), eq(variables['USETESTPYTHONEXTENSIONS'], false))
6376
- stage: CheckPythonWorkerDependencies
64-
dependsOn: BuildPythonWorker
77+
dependsOn: []
6578
jobs:
6679
- template: /eng/templates/jobs/ci-dependency-check.yml@self
6780
parameters:
6881
PoolName: 1es-pool-azfunc-public
6982
- stage: RunWorkerUnitTests
70-
dependsOn: BuildPythonWorker
83+
dependsOn: CheckPythonWorkerDependencies
7184
jobs:
7285
- template: /eng/templates/jobs/ci-unit-tests.yml@self
7386
parameters:
7487
PROJECT_DIRECTORY: 'workers'
7588
PoolName: 1es-pool-azfunc-public
7689
- stage: RunWorkerEmulatorTests
77-
dependsOn: BuildPythonWorker
90+
dependsOn: CheckPythonWorkerDependencies
7891
jobs:
7992
- template: /eng/templates/jobs/ci-emulator-tests.yml@self
8093
parameters:
@@ -98,8 +111,6 @@ extends:
98111
PROJECT_DIRECTORY: 'runtimes/v2'
99112
PoolName: 1es-pool-azfunc-public
100113

101-
102-
103114
# Python V1 Library Build and Test Stages
104115
- stage: BuildV1Library
105116
dependsOn: []

eng/pack/scripts/mac_arm64_deps.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
python -m venv .env
44
source .env/bin/activate
55
python -m pip install --upgrade pip
6+
python -m pip install "setuptools>=62,<82.0"
67

78
cd workers
89
python -m pip install .

eng/pack/scripts/nix_arm64_deps.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
python -m venv .env
44
source .env/bin/activate
55
python -m pip install --upgrade pip
6+
python -m pip install "setuptools>=62,<82.0"
67

78
version_minor=$(echo $1 | cut -d '.' -f 2)
89
mkdir -p $BUILD_SOURCESDIRECTORY/deps
@@ -21,6 +22,7 @@ docker run --name my-arm64-container --platform linux/arm64 \
2122
ls -la /src # debug: see what files exist
2223
apt-get update && apt-get install -y git curl && \
2324
pip install --upgrade pip && \
25+
pip install "setuptools>=62,<82.0" && \
2426
cd workers && \
2527
pip install . && \
2628
pip install . --target /src && \

eng/pack/scripts/nix_deps.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
python -m venv .env
44
source .env/bin/activate
55
python -m pip install --upgrade pip
6+
python -m pip install "setuptools>=62,<82.0"
67

78
cd workers
89
python -m pip install .

eng/pack/scripts/win_deps.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $versionMinor = [int]$versionParts[1]
77
python -m venv .env
88
.env\Scripts\Activate.ps1
99
python -m pip install --upgrade pip
10+
python -m pip install "setuptools>=62,<82.0"
1011

1112
cd workers
1213
python -m pip install .

eng/templates/jobs/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
parameters:
22
PYTHON_VERSION: ''
3+
SIMPLE_VERSION: ''
34
PROJECT_NAME: ''
45
PROJECT_DIRECTORY: ''
56

67
jobs:
7-
- job: "Build"
8-
displayName: 'Build'
8+
- job: "Build${{ parameters.SIMPLE_VERSION }}"
9+
displayName: 'Build ${{ parameters.PROJECT_NAME }}'
910

1011
pool:
1112
name: 1es-pool-azfunc-public

eng/templates/shared/build-steps.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ steps:
2020
pip install pip-audit
2121
cd ${{ parameters.PROJECT_DIRECTORY }}
2222
pip-audit -r requirements.txt
23-
displayName: 'Run vulnerability scan'
24-
continueOnError: true
23+
displayName: 'Run vulnerability scan'

workers/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
"python-dateutil~=2.9.0",
3131
"protobuf~=4.25.3; python_version < '3.13'",
3232
"protobuf~=5.29.0; python_version == '3.13'",
33-
"protobuf~=6.32.1; python_version == '3.14'",
33+
"protobuf~=6.33.1; python_version == '3.14'",
3434
"grpcio-tools~=1.59.0;python_version < '3.13'",
3535
"grpcio-tools~=1.70.0; python_version == '3.13'",
3636
"grpcio-tools~=1.75.1; python_version == '3.14'",

0 commit comments

Comments
 (0)