Skip to content

Commit 715a9dc

Browse files
hallvictoriahallvictoria
authored
chore: remove 3.7 & 3.8 from worker nuget (#1810)
* update worker release based on host changes * remove 3.7 & 3.8 from build steps * remove 3.7 & 3.8 from afw & pyproject * lint * Wait to do 3.7 & 3.8 code clean up * lint * update uvloop for 3.14 * fix dir * backport context fix to v1 * tyop * fix azurite * fix azurite pt2 * pyproject syntax * correct version
1 parent 411c708 commit 715a9dc

File tree

17 files changed

+42
-127
lines changed

17 files changed

+42
-127
lines changed

‎eng/pack/Microsoft.Azure.Functions.V4.PythonWorker.nuspec‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
<copyright>© .NET Foundation. All rights reserved.</copyright>
1111
</metadata>
1212
<files>
13-
<file src="..\..\3.7_WINDOWS_X64\**" target="tools\3.7\WINDOWS\X64" />
14-
<file src="..\..\3.7_WINDOWS_X86\**" target="tools\3.7\WINDOWS\X86" />
15-
<file src="..\..\3.7_LINUX_X64\**" target="tools\3.7\LINUX\X64" />
16-
<file src="..\..\3.7_OSX_X64\**" target="tools\3.7\OSX\X64" />
17-
<file src="..\..\3.8_WINDOWS_X64\**" target="tools\3.8\WINDOWS\X64" />
18-
<file src="..\..\3.8_WINDOWS_X86\**" target="tools\3.8\WINDOWS\X86" />
19-
<file src="..\..\3.8_LINUX_X64\**" target="tools\3.8\LINUX\X64" />
20-
<file src="..\..\3.8_OSX_X64\**" target="tools\3.8\OSX\X64" />
2113
<file src="..\..\3.9_WINDOWS_X64\**" target="tools\3.9\WINDOWS\X64" />
2214
<file src="..\..\3.9_WINDOWS_X86\**" target="tools\3.9\WINDOWS\X86" />
2315
<file src="..\..\3.9_LINUX_X64\**" target="tools\3.9\LINUX\X64" />

‎eng/pack/templates/macos_64_env_gen.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ steps:
7070
cd workers
7171
pip-audit -r requirements.txt
7272
displayName: 'Run vulnerability scan'
73-
condition: ne(variables['pythonVersion'], '3.7')
7473
- task: CopyFiles@2
7574
inputs:
7675
contents: '$(workerPath)'
@@ -106,6 +105,7 @@ steps:
106105
$expected = @(
107106
".artifactignore",
108107
"azure",
108+
"azurefunctions",
109109
"azure_functions_worker",
110110
"azure_functions_worker/protos/FunctionRpc_pb2.py",
111111
"azure_functions_worker/protos/FunctionRpc_pb2_grpc.py",
@@ -124,13 +124,6 @@ steps:
124124
"werkzeug",
125125
"worker.py"
126126
)
127-
# Add azurefunctions/ conditionally
128-
if ("$(minorVersion)" -ne "7") {
129-
Write-Host "Including azurefunctions/ in expected list (minorVersion=$(minorVersion))"
130-
$expected += "azurefunctions"
131-
} else {
132-
Write-Host "Skipping azurefunctions/ (minorVersion=7)"
133-
}
134127
135128
$missing = @()
136129

‎eng/pack/templates/nix_arm64_env_gen.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ steps:
7676
cd workers
7777
pip-audit -r requirements.txt
7878
displayName: 'Run vulnerability scan'
79-
condition: ne(variables['pythonVersion'], '3.7')
8079
- task: CopyFiles@2
8180
inputs:
8281
contents: '$(workerPath)'
@@ -112,6 +111,7 @@ steps:
112111
$expected = @(
113112
".artifactignore",
114113
"azure",
114+
"azurefunctions",
115115
"azure_functions_worker",
116116
"azure_functions_worker/protos/FunctionRpc_pb2.py",
117117
"azure_functions_worker/protos/FunctionRpc_pb2_grpc.py",
@@ -130,13 +130,6 @@ steps:
130130
"werkzeug",
131131
"worker.py"
132132
)
133-
# Add azurefunctions/ conditionally
134-
if ("$(minorVersion)" -ne "7") {
135-
Write-Host "Including azurefunctions/ in expected list (minorVersion=$(minorVersion))"
136-
$expected += "azurefunctions"
137-
} else {
138-
Write-Host "Skipping azurefunctions/ (minorVersion=7)"
139-
}
140133
141134
$missing = @()
142135

‎eng/pack/templates/nix_env_gen.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ steps:
7070
cd workers
7171
pip-audit -r requirements.txt
7272
displayName: 'Run vulnerability scan'
73-
condition: ne(variables['pythonVersion'], '3.7')
7473
- task: CopyFiles@2
7574
inputs:
7675
contents: '$(workerPath)'
@@ -107,6 +106,7 @@ steps:
107106
".artifactignore",
108107
"azure",
109108
"azure_functions_worker",
109+
"azurefunctions",
110110
"azure_functions_worker/protos/FunctionRpc_pb2.py",
111111
"azure_functions_worker/protos/FunctionRpc_pb2_grpc.py",
112112
"azure_functions_worker/protos/_src",
@@ -124,13 +124,6 @@ steps:
124124
"werkzeug",
125125
"worker.py"
126126
)
127-
# Add azurefunctions/ conditionally
128-
if ("$(minorVersion)" -ne "7") {
129-
Write-Host "Including azurefunctions/ in expected list (minorVersion=$(minorVersion))"
130-
$expected += "azurefunctions"
131-
} else {
132-
Write-Host "Skipping azurefunctions/ (minorVersion=7)"
133-
}
134127
135128
$missing = @()
136129

‎eng/pack/templates/win_env_gen.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ steps:
6969
cd workers
7070
pip-audit -r requirements.txt
7171
displayName: 'Run vulnerability scan'
72-
condition: ne(variables['pythonVersion'], '3.7')
7372
- task: CopyFiles@2
7473
inputs:
7574
contents: '$(workerPath)'
@@ -105,6 +104,7 @@ steps:
105104
$expected = @(
106105
".artifactignore",
107106
"azure",
107+
"azurefunctions",
108108
"azure_functions_worker",
109109
"azure_functions_worker/protos/FunctionRpc_pb2.py",
110110
"azure_functions_worker/protos/FunctionRpc_pb2_grpc.py",
@@ -123,13 +123,6 @@ steps:
123123
"werkzeug",
124124
"worker.py"
125125
)
126-
# Add azurefunctions/ conditionally
127-
if ("$(minorVersion)" -ne "7") {
128-
Write-Host "Including azurefunctions/ in expected list (minorVersion=$(minorVersion))"
129-
$expected += "azurefunctions"
130-
} else {
131-
Write-Host "Skipping azurefunctions/ (minorVersion=7)"
132-
}
133126
134127
$missing = @()
135128

‎eng/scripts/install-dependencies.sh‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ python -m pip install -e runtimes/v1
66
python -m pip install -U azure-functions --pre
77
python -m pip install -U -e $2/[dev]
88

9-
if [[ $1 != "3.7" ]]; then
10-
python -m pip install --pre -U -e $2/[test-http-v2]
11-
fi
12-
if [[ $1 != "3.7" && $1 != "3.8" ]]; then
13-
python -m pip install --pre -U -e $2/[test-deferred-bindings]
9+
python -m pip install --pre -U -e $2/[test-http-v2]
10+
python -m pip install --pre -U -e $2/[test-deferred-bindings]
11+
12+
SERVICEBUS_DIR="./servicebus_dir"
13+
python -m pip install --pre -U --target "$SERVICEBUS_DIR" azurefunctions-extensions-bindings-servicebus==1.0.0b2
14+
python -c "import sys; sys.path.insert(0, '$SERVICEBUS_DIR'); import azurefunctions.extensions.bindings.servicebus as sb; print('servicebus version:', sb.__version__)"
1415

15-
SERVICEBUS_DIR="./servicebus_dir"
16-
python -m pip install --pre -U --target "$SERVICEBUS_DIR" azurefunctions-extensions-bindings-servicebus==1.0.0b2
17-
python -c "import sys; sys.path.insert(0, '$SERVICEBUS_DIR'); import azurefunctions.extensions.bindings.servicebus as sb; print('servicebus version:', sb.__version__)"
18-
fi

‎eng/scripts/test-extensions.sh‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
#!/bin/bash
22

33
python -m pip install --upgrade pip
4-
if [[ $2 != "3.7" ]]; then
5-
python -m pip install -e $1/PythonExtensionArtifact/$3
6-
python -m pip install --pre -e workers/[test-http-v2]
7-
fi
8-
if [[ $2 != "3.7" && $2 != "3.8" ]]; then
9-
python -m pip install -e $1/PythonExtensionArtifact/$3
10-
python -m pip install --pre -U -e workers/[test-deferred-bindings]
11-
fi
4+
5+
python -m pip install -e $1/PythonExtensionArtifact/$3
6+
python -m pip install --pre -e workers/[test-http-v2]
7+
python -m pip install --pre -U -e workers/[test-deferred-bindings]
128

139
python -m pip install -U -e workers/[dev]

‎eng/scripts/test-sdk.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@ python -m pip install --upgrade pip
44
python -m pip install -e $1/PythonSdkArtifact
55
python -m pip install -e workers/[dev]
66

7-
if [[ $2 != "3.7" ]]; then
8-
python -m pip install --pre -U -e workers/[test-http-v2]
9-
fi
10-
if [[ $2 != "3.7" && $2 != "3.8" ]]; then
11-
python -m pip install --pre -U -e workers/[test-deferred-bindings]
12-
fi
7+
python -m pip install --pre -U -e workers/[test-http-v2]
8+
python -m pip install --pre -U -e workers/[test-deferred-bindings]

‎eng/templates/official/jobs/build-artifacts.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ jobs:
77
os: windows
88
strategy:
99
matrix:
10-
Python37V4:
11-
pythonVersion: '3.7'
12-
normalizedPythonVersion: '3.7'
13-
Python38V4:
14-
pythonVersion: '3.8'
15-
normalizedPythonVersion: '3.8'
1610
Python39V4:
1711
pythonVersion: '3.9'
1812
normalizedPythonVersion: '3.9'
@@ -52,12 +46,6 @@ jobs:
5246
os: windows
5347
strategy:
5448
matrix:
55-
Python37V4:
56-
pythonVersion: '3.7'
57-
normalizedPythonVersion: '3.7'
58-
Python38V4:
59-
pythonVersion: '3.8'
60-
normalizedPythonVersion: '3.8'
6149
Python39V4:
6250
pythonVersion: '3.9'
6351
normalizedPythonVersion: '3.9'
@@ -97,12 +85,6 @@ jobs:
9785
os: linux
9886
strategy:
9987
matrix:
100-
Python37V4:
101-
pythonVersion: '3.7'
102-
normalizedPythonVersion: '3.7'
103-
Python38V4:
104-
pythonVersion: '3.8'
105-
normalizedPythonVersion: '3.8'
10688
Python39V4:
10789
pythonVersion: '3.9'
10890
normalizedPythonVersion: '3.9'
@@ -141,12 +123,6 @@ jobs:
141123
os: macOS
142124
strategy:
143125
matrix:
144-
Python37V4:
145-
pythonVersion: '3.7'
146-
normalizedPythonVersion: '3.7'
147-
Python38V4:
148-
pythonVersion: '3.8'
149-
normalizedPythonVersion: '3.8'
150126
Python39V4:
151127
pythonVersion: '3.9'
152128
normalizedPythonVersion: '3.9'

‎eng/templates/official/jobs/publish-library-release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ jobs:
5757
dependsOn: ['CheckGitHubRelease']
5858
displayName: 'PyPI Package'
5959
steps:
60-
- script: |
61-
echo "##vso[task.setvariable variable=BranchName]refs/heads/${{ parameters.BRANCH_NAME }}/$(NewLibraryVersion)"
62-
displayName: 'Set branch variable'
60+
- powershell: |
61+
Write-Host "##vso[task.setvariable variable=BranchName]refs/heads/${{ parameters.BRANCH_NAME }}/$(NewWorkerVersion)"
62+
displayName: "Set branch variable"
6363
- powershell: |
6464
Write-Host "BranchName: $(BranchName)"
6565
displayName: 'Display BranchName variable'
@@ -74,13 +74,13 @@ jobs:
7474
branchName: '$(BranchName)'
7575
allowPartiallySucceededBuilds: true
7676
allowFailedBuilds: true
77-
targetPath: '$(Pipeline.Workspace)/PythonWorkerArtifact'
77+
targetPath: 'PythonRuntimeArtifact'
7878
- task: UsePythonVersion@0
7979
displayName: 'Use Python 3.13'
8080
inputs:
8181
versionSpec: 3.13
8282
- powershell: |
83-
$newLibraryVersion = "$(NewLibraryVersion)"
83+
$newLibraryVersion = "$(NewWorkerVersion)"
8484
$pypiToken = "$(PypiToken)"
8585
8686
# Setup local Python environment
@@ -89,7 +89,7 @@ jobs:
8989
pip install twine
9090
9191
# Publish artifacts to PyPi
92-
twine upload --repository-url https://upload.pypi.org/legacy/ --username "__token__" --password "$pypiToken" PythonRuntimeArtifact/${{ parameters.PROJECT_DIRECTORY }}/dist/*
92+
twine upload --repository-url https://upload.pypi.org/legacy/ --username "__token__" --password "$pypiToken" PythonRuntimeArtifact/${{ parameters.PROJECT_NAME }}/${{ parameters.PROJECT_DIRECTORY }}/dist/*
9393
Start-Sleep -Seconds 3
9494
9595
# Checking if the new version is uploaded

0 commit comments

Comments
 (0)