Skip to content

Commit 0d03a4d

Browse files
vrdmrvrdmr
authored
Preparing nuspec file and pipeline changes for release (#966)
The nuspec files needed correction for Python 3.10 generation. Removed Tests section from azure-pipelines.yml as it wasn't required. Removed Python 3.6 generation and the V3 builds. Referencing the correct V4 nuspec. Also removed the need to install azure-functions in the pack/scripts/nix_deps.sh as we now made it as a required installation in setup.py.
1 parent 65c30d8 commit 0d03a4d

File tree

4 files changed

+26
-108
lines changed

4 files changed

+26
-108
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ What's coming?
3131

3232
- [Durable Functions For Python](https://github.com/Azure/azure-functions-durable-python)
3333

34-
###Get Started
34+
### Get Started
3535

3636
- [Create your first Python function](https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-function-python)
3737
- [Developer guide](https://docs.microsoft.com/en-us/azure/azure-functions/functions-reference-python)

‎azure-pipelines.yml

Lines changed: 17 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -6,75 +6,17 @@ trigger:
66
- dev
77

88
variables:
9-
DOTNET_VERSION: '3.1.405'
10-
DOTNET_VERSION_5: '5.0.x'
11-
DOTNET_VERSION_6: '6.x'
129
patchBuildNumberForDev: $(Build.BuildNumber)
13-
PROD_V3_WORKER_PY : 'python/prodV3/worker.py'
1410
PROD_V4_WORKER_PY : 'python/prodV4/worker.py'
1511

1612
jobs:
17-
- job: Tests
18-
pool:
19-
name: '1ES-Hosted-AzFunc' #MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu
20-
demands:
21-
- ImageOverride -equals MMSUbuntu20.04TLS
22-
strategy:
23-
matrix:
24-
Python37:
25-
pythonVersion: '3.7'
26-
Python38:
27-
pythonVersion: '3.8'
28-
Python39:
29-
pythonVersion: '3.9'
30-
Python310:
31-
pythonVersion: '3.10'
32-
steps:
33-
- task: UsePythonVersion@0
34-
inputs:
35-
versionSpec: '$(pythonVersion)'
36-
addToPath: true
37-
- task: UseDotNet@2
38-
displayName: 'Install dotnet'
39-
inputs:
40-
packageType: 'sdk'
41-
version: $(DOTNET_VERSION)
42-
- task: UseDotNet@2
43-
displayName: 'Install DotNet 5.x'
44-
inputs:
45-
packageType: 'sdk'
46-
version: $(DOTNET_VERSION_5)
47-
- task: UseDotNet@2
48-
displayName: 'Install DotNet 6.x'
49-
inputs:
50-
packageType: 'sdk'
51-
version: $(DOTNET_VERSION_6)
52-
- task: ShellScript@2
53-
inputs:
54-
disableAutoCwd: true
55-
scriptPath: .ci/linux_devops_build.sh
56-
displayName: 'Build'
57-
5813
- job: Build_WINDOWS_X64
59-
dependsOn: 'Tests'
6014
pool:
6115
name: '1ES-Hosted-AzFunc' #MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu
6216
demands:
6317
- ImageOverride -equals MMS2019TLS
6418
strategy:
6519
matrix:
66-
Python36V3:
67-
pythonVersion: '3.6'
68-
workerPath: $(PROD_V3_WORKER_PY)
69-
Python37V3:
70-
pythonVersion: '3.7'
71-
workerPath: $(PROD_V3_WORKER_PY)
72-
Python38V3:
73-
pythonVersion: '3.8'
74-
workerPath: $(PROD_V3_WORKER_PY)
75-
Python39V3:
76-
pythonVersion: '3.9'
77-
workerPath: $(PROD_V3_WORKER_PY)
7820
Python37V4:
7921
pythonVersion: '3.7'
8022
workerPath: $(PROD_V4_WORKER_PY)
@@ -84,6 +26,9 @@ jobs:
8426
Python39V4:
8527
pythonVersion: '3.9'
8628
workerPath: $(PROD_V4_WORKER_PY)
29+
Python310V4:
30+
pythonVersion: '3.10'
31+
workerPath: $(PROD_V4_WORKER_PY)
8732
steps:
8833
- template: pack/templates/win_env_gen.yml
8934
parameters:
@@ -92,22 +37,12 @@ jobs:
9237
architecture: 'x64'
9338
artifactName: '$(pythonVersion)_WINDOWS_X64'
9439
- job: Build_WINDOWS_X86
95-
dependsOn: 'Tests'
9640
pool:
9741
name: '1ES-Hosted-AzFunc' #MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu
9842
demands:
9943
- ImageOverride -equals MMS2019TLS
10044
strategy:
10145
matrix:
102-
Python37V3:
103-
pythonVersion: '3.7'
104-
workerPath: $(PROD_V3_WORKER_PY)
105-
Python38V3:
106-
pythonVersion: '3.8'
107-
workerPath: $(PROD_V3_WORKER_PY)
108-
Python39V3:
109-
pythonVersion: '3.9'
110-
workerPath: $(PROD_V3_WORKER_PY)
11146
Python37V4:
11247
pythonVersion: '3.7'
11348
workerPath: $(PROD_V4_WORKER_PY)
@@ -117,6 +52,9 @@ jobs:
11752
Python39V4:
11853
pythonVersion: '3.9'
11954
workerPath: $(PROD_V4_WORKER_PY)
55+
Python310V4:
56+
pythonVersion: '3.10'
57+
workerPath: $(PROD_V4_WORKER_PY)
12058
steps:
12159
- template: pack/templates/win_env_gen.yml
12260
parameters:
@@ -125,25 +63,12 @@ jobs:
12563
architecture: 'x86'
12664
artifactName: '$(pythonVersion)_WINDOWS_x86'
12765
- job: Build_LINUX_X64
128-
dependsOn: 'Tests'
12966
pool:
13067
name: '1ES-Hosted-AzFunc' # MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu
13168
demands:
13269
- ImageOverride -equals MMSUbuntu20.04TLS
13370
strategy:
13471
matrix:
135-
Python36V3:
136-
pythonVersion: '3.6'
137-
workerPath: $(PROD_V3_WORKER_PY)
138-
Python37V3:
139-
pythonVersion: '3.7'
140-
workerPath: $(PROD_V3_WORKER_PY)
141-
Python38V3:
142-
pythonVersion: '3.8'
143-
workerPath: $(PROD_V3_WORKER_PY)
144-
Python39V3:
145-
pythonVersion: '3.9'
146-
workerPath: $(PROD_V3_WORKER_PY)
14772
Python37V4:
14873
pythonVersion: '3.7'
14974
workerPath: $(PROD_V4_WORKER_PY)
@@ -153,30 +78,20 @@ jobs:
15378
Python39V4:
15479
pythonVersion: '3.9'
15580
workerPath: $(PROD_V4_WORKER_PY)
81+
Python310V4:
82+
pythonVersion: '3.10'
83+
workerPath: $(PROD_V4_WORKER_PY)
15684
steps:
15785
- template: pack/templates/nix_env_gen.yml
15886
parameters:
15987
pythonVersion: '$(pythonVersion)'
16088
workerPath: '$(workerPath)'
16189
artifactName: '$(pythonVersion)_LINUX_X64'
16290
- job: Build_OSX_X64
163-
dependsOn: 'Tests'
16491
pool:
16592
vmImage: 'macOS-10.15'
16693
strategy:
16794
matrix:
168-
Python36V3:
169-
pythonVersion: '3.6'
170-
workerPath: $(PROD_V3_WORKER_PY)
171-
Python37V3:
172-
pythonVersion: '3.7'
173-
workerPath: $(PROD_V3_WORKER_PY)
174-
Python38V3:
175-
pythonVersion: '3.8'
176-
workerPath: $(PROD_V3_WORKER_PY)
177-
Python39V3:
178-
pythonVersion: '3.9'
179-
workerPath: $(PROD_V3_WORKER_PY)
18095
Python37V4:
18196
pythonVersion: '3.7'
18297
workerPath: $(PROD_V4_WORKER_PY)
@@ -186,6 +101,9 @@ jobs:
186101
Python39V4:
187102
pythonVersion: '3.9'
188103
workerPath: $(PROD_V4_WORKER_PY)
104+
Python310V4:
105+
pythonVersion: '3.10'
106+
workerPath: $(PROD_V4_WORKER_PY)
189107
steps:
190108
- template: pack/templates/nix_env_gen.yml
191109
parameters:
@@ -197,21 +115,15 @@ jobs:
197115
dependsOn: ['Build_WINDOWS_X64', 'Build_WINDOWS_X86', 'Build_LINUX_X64', 'Build_OSX_X64']
198116
condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
199117
pool:
200-
# vmImage: 'vs2017-win2016'
201-
name: '1ES-Hosted-AzFunc' # MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu
118+
name: '1ES-Hosted-AzFunc'
202119
demands:
203-
- ImageOverride -equals MMSUbuntu20.04TLS
120+
- ImageOverride -equals MMS2019TLS
204121
steps:
205122
- bash: |
206123
echo "Releasing from $BUILD_SOURCEBRANCHNAME"
207-
apt install jq
124+
sudo apt-get install -y jq
208125
209-
if [[ $BUILD_SOURCEBRANCHNAME = 3\.* ]]
210-
then
211-
echo "Generating V3 Release Package for $BUILD_SOURCEBRANCHNAME"
212-
NUSPEC="pack\Microsoft.Azure.Functions.V3.PythonWorker.nuspec"
213-
WKVERSION="$BUILD_SOURCEBRANCHNAME"
214-
elif [[ $BUILD_SOURCEBRANCHNAME = 4\.* ]]
126+
if [[ $BUILD_SOURCEBRANCHNAME = 4\.* ]]
215127
then
216128
echo "Generating V4 Release Package for $BUILD_SOURCEBRANCHNAME"
217129
NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
@@ -226,7 +138,7 @@ jobs:
226138
# this is only to test nuget related workflow because we are setting nuspec here
227139
echo "Generating Integration Test Package for $BUILD_SOURCEBRANCHNAME for testing purpose"
228140
LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' | cut -d'.' -f-2)
229-
NUSPEC="pack\Microsoft.Azure.Functions.V3.PythonWorker.nuspec"
141+
NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
230142
# Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev)
231143
WKVERSION="3.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
232144
echo "No Matching Release Tag For $BUILD_SOURCEBRANCH"

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
<file src="..\3.9_WINDOWS_X86\**" target="tools\3.9\WINDOWS\X86" />
2323
<file src="..\3.9_LINUX_X64\**" target="tools\3.9\LINUX\X64" />
2424
<file src="..\3.9_OSX_X64\**" target="tools\3.9\OSX\X64" />
25-
<file src="..\python\prodV3\worker.config.json" target="tools" />
25+
<file src="..\3.10_WINDOWS_X64\**" target="tools\3.10\WINDOWS\X64" />
26+
<file src="..\3.10_WINDOWS_X86\**" target="tools\3.10\WINDOWS\X86" />
27+
<file src="..\3.10_LINUX_X64\**" target="tools\3.10\LINUX\X64" />
28+
<file src="..\3.10_OSX_X64\**" target="tools\3.10\OSX\X64" />
29+
<file src="..\python\prodV4\worker.config.json" target="tools" />
2630
<file src="Microsoft.Azure.Functions.PythonWorker.targets" target="build" />
31+
<file src="..\_manifest\manifest.json" target="SBOM\manifest.json" />
32+
<file src="..\_manifest\spdx_2.2\manifest.spdx.json" target="SBOM\manifest.spdx.json" />
2733
</files>
2834
</package>

‎pack/scripts/nix_deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ python -m pip install --upgrade pip
66

77
python -m pip install .
88

9-
python -m pip install . azure-functions --no-compile --target "$BUILD_SOURCESDIRECTORY/deps"
9+
python -m pip install . --no-compile --target "$BUILD_SOURCESDIRECTORY/deps"

0 commit comments

Comments
 (0)