Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change prerelease versioning #13500

Merged
merged 1 commit into from
Sep 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions eng/pipelines/templates/stages/archetype-python-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,28 +249,28 @@ stages:
displayName: Setup DevOpsFeedName
- task: TwineAuthenticate@0
displayName: 'Authenticate to feed: $(DevFeedName)'
displayName: 'Authenticate to feed'
inputs:
artifactFeeds: $(DevFeedName)

- ${{ each artifact in parameters.Artifacts }}:

- pwsh: |
Get-ChildItem $(Pipeline.Workspace)/${{parameters.ArtifactName}}
New-Item -Type Directory -Name ${{artifact.safeName}} -Path $(Pipeline.Workspace)
$underscorePrefix = "${{artifact.name}}"
$dashPrefix = "${{artifact.name}}".Replace("_", "-")
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$dashPrefix-[0-9]*.[0-9]*.[0-9]*.dev* $(Pipeline.Workspace)/${{artifact.safeName}}
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$underscorePrefix-[0-9]*.[0-9]*.[0-9]*.dev* $(Pipeline.Workspace)/${{artifact.safeName}}
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$dashPrefix-[0-9]*.[0-9]*.[0-9]*a[0-9]* $(Pipeline.Workspace)/${{artifact.safeName}}
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$underscorePrefix-[0-9]*.[0-9]*.[0-9]*a[0-9]* $(Pipeline.Workspace)/${{artifact.safeName}}
Get-ChildItem $(Pipeline.Workspace)/${{artifact.safeName}}
$fileCount = (Get-ChildItem $(Pipeline.Workspace)/${{artifact.safeName}} | Measure-Object).Count
Write-Output "##vso[task.setvariable variable=FilesToUploadCount]$fileCount"
if ($fileCount -eq 0) {
Write-Host "No alpha packages for ${{artifact.safeName}} to publish."
exit 0
}
- script: |
set -e
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.whl
echo "Uploaded whl to devops feed"
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.zip
echo "Uploaded sdist to devops feed"
displayName: 'Publish package to feed: $(DevFeedName)'
condition: gt(variables['FilesToUploadCount'], 0)
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*a*.whl
echo "Uploaded whl to devops feed $(DevFeedName)"
twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*a*.zip
echo "Uploaded sdist to devops feed $(DevFeedName)"
displayName: 'Publish ${{artifact.name}} alpha package'
3 changes: 1 addition & 2 deletions eng/versioning/version_set_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ def format_build_id(build_id):

def get_dev_version(current_version, build_id):
parsed_version = parse(current_version)
#release = parsed_version.release
return "{0}.dev{1}".format(parsed_version, build_id)
return "{0}a{1}".format(parsed_version.base_version, build_id)
scbedd marked this conversation as resolved.
Show resolved Hide resolved

def is_in_service(sdk_path, setup_py_location, service_name):
sdk_prefix = path.normpath(sdk_path)
Expand Down
6 changes: 3 additions & 3 deletions scripts/devops_tasks/test_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,10 @@ def _is_package_installed(self, package, version):
installed_pkgs = get_installed_packages(site_packages)
logging.info("Installed packages: {}".format(installed_pkgs))
# Verify installed package version
# Search for exact version or dev build version of current version.
# Search for exact version or alpha build version of current version.
pkg_search_string = "{0}=={1}".format(package, version)
dev_build_search_string = "{0}=={1}.dev".format(package, version)
return any(p == pkg_search_string or p.startswith(dev_build_search_string) for p in installed_pkgs)
alpha_build_search_string = "{0}=={1}a".format(package, version)
return any(p == pkg_search_string or p.startswith(alpha_build_search_string) for p in installed_pkgs)


# This method identifies package dependency map for all packages in azure sdk
Expand Down
3 changes: 3 additions & 0 deletions sdk/template/azure-template/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release History

## 0.0.13b1 (2020-08-27)
- Testing out some alpha and beta versioning

## 0.0.12 (Unreleased)
- Test a successful Release

Expand Down
2 changes: 1 addition & 1 deletion sdk/template/azure-template/azure/template/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# matches SEMVER
VERSION = "0.0.12"
VERSION = "0.0.13b1"
2 changes: 1 addition & 1 deletion sdk/template/azure-template/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
license='MIT License',
# ensure that the development status reflects the status of your package
classifiers=[
'Development Status :: 3 - Alpha',
"Development Status :: 4 - Beta",

'Programming Language :: Python',
'Programming Language :: Python :: 2',
Expand Down