Skip to content

Commit 236901f

Browse files
authored
Change prerelease versioning (Azure#13500)
- Use a instead of dev - Fix dev to alpha for regression test - Clean-up some devops feed publishing steps
1 parent fdf002b commit 236901f

File tree

6 files changed

+22
-20
lines changed

6 files changed

+22
-20
lines changed

eng/pipelines/templates/stages/archetype-python-release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -249,28 +249,28 @@ stages:
249249
displayName: Setup DevOpsFeedName
250250
251251
- task: TwineAuthenticate@0
252-
displayName: 'Authenticate to feed: $(DevFeedName)'
252+
displayName: 'Authenticate to feed'
253253
inputs:
254254
artifactFeeds: $(DevFeedName)
255255

256256
- ${{ each artifact in parameters.Artifacts }}:
257-
258257
- pwsh: |
259258
Get-ChildItem $(Pipeline.Workspace)/${{parameters.ArtifactName}}
260259
New-Item -Type Directory -Name ${{artifact.safeName}} -Path $(Pipeline.Workspace)
261260
$underscorePrefix = "${{artifact.name}}"
262261
$dashPrefix = "${{artifact.name}}".Replace("_", "-")
263-
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$dashPrefix-[0-9]*.[0-9]*.[0-9]*.dev* $(Pipeline.Workspace)/${{artifact.safeName}}
264-
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$underscorePrefix-[0-9]*.[0-9]*.[0-9]*.dev* $(Pipeline.Workspace)/${{artifact.safeName}}
262+
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$dashPrefix-[0-9]*.[0-9]*.[0-9]*a[0-9]* $(Pipeline.Workspace)/${{artifact.safeName}}
263+
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$underscorePrefix-[0-9]*.[0-9]*.[0-9]*a[0-9]* $(Pipeline.Workspace)/${{artifact.safeName}}
265264
Get-ChildItem $(Pipeline.Workspace)/${{artifact.safeName}}
265+
266266
$fileCount = (Get-ChildItem $(Pipeline.Workspace)/${{artifact.safeName}} | Measure-Object).Count
267-
Write-Output "##vso[task.setvariable variable=FilesToUploadCount]$fileCount"
267+
if ($fileCount -eq 0) {
268+
Write-Host "No alpha packages for ${{artifact.safeName}} to publish."
269+
exit 0
270+
}
268271
269-
- script: |
270-
set -e
271-
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.whl
272-
echo "Uploaded whl to devops feed"
273-
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.zip
274-
echo "Uploaded sdist to devops feed"
275-
displayName: 'Publish package to feed: $(DevFeedName)'
276-
condition: gt(variables['FilesToUploadCount'], 0)
272+
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*a*.whl
273+
echo "Uploaded whl to devops feed $(DevFeedName)"
274+
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*a*.zip
275+
echo "Uploaded sdist to devops feed $(DevFeedName)"
276+
displayName: 'Publish ${{artifact.name}} alpha package'

eng/versioning/version_set_dev.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ def format_build_id(build_id):
2525

2626
def get_dev_version(current_version, build_id):
2727
parsed_version = parse(current_version)
28-
#release = parsed_version.release
29-
return "{0}.dev{1}".format(parsed_version, build_id)
28+
return "{0}a{1}".format(parsed_version.base_version, build_id)
3029

3130
def is_in_service(sdk_path, setup_py_location, service_name):
3231
sdk_prefix = path.normpath(sdk_path)

scripts/devops_tasks/test_regression.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ def _is_package_installed(self, package, version):
260260
installed_pkgs = get_installed_packages(site_packages)
261261
logging.info("Installed packages: {}".format(installed_pkgs))
262262
# Verify installed package version
263-
# Search for exact version or dev build version of current version.
263+
# Search for exact version or alpha build version of current version.
264264
pkg_search_string = "{0}=={1}".format(package, version)
265-
dev_build_search_string = "{0}=={1}.dev".format(package, version)
266-
return any(p == pkg_search_string or p.startswith(dev_build_search_string) for p in installed_pkgs)
265+
alpha_build_search_string = "{0}=={1}a".format(package, version)
266+
return any(p == pkg_search_string or p.startswith(alpha_build_search_string) for p in installed_pkgs)
267267

268268

269269
# This method identifies package dependency map for all packages in azure sdk

sdk/template/azure-template/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Release History
22

3+
## 0.0.13b1 (2020-08-27)
4+
- Testing out some alpha and beta versioning
5+
36
## 0.0.12 (Unreleased)
47
- Test a successful Release
58

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# matches SEMVER
2-
VERSION = "0.0.12"
2+
VERSION = "0.0.13b1"

sdk/template/azure-template/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
license='MIT License',
4343
# ensure that the development status reflects the status of your package
4444
classifiers=[
45-
'Development Status :: 3 - Alpha',
45+
"Development Status :: 4 - Beta",
4646

4747
'Programming Language :: Python',
4848
'Programming Language :: Python :: 2',

0 commit comments

Comments
 (0)