Change prerelease versioning

- Use a instead of dev
Azure · Sep 1, 2020 · 49c2fc8 · 49c2fc8
1 parent 1c9980c
commit 49c2fc8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-python-release.yml b/eng/pipelines/templates/stages/archetype-python-release.yml
@@ -260,17 +260,17 @@ stages:
             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* $(Pipeline.Workspace)/${{artifact.safeName}}
+            Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/$underscorePrefix-[0-9]*.[0-9]*.[0-9]*a* $(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"
 
         - script: |
             set -e
-            twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.whl
+            twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*a*.whl
             echo "Uploaded whl to devops feed"
-            twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.zip
+            twine upload --repository $(DevFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*a*.zip
             echo "Uploaded sdist to devops feed"
           displayName: 'Publish package to feed: $(DevFeedName)'
           condition: gt(variables['FilesToUploadCount'], 0)
diff --git a/eng/versioning/version_set_dev.py b/eng/versioning/version_set_dev.py
@@ -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)
 
 def is_in_service(sdk_path, setup_py_location, service_name):
     sdk_prefix = path.normpath(sdk_path)

diff --git a/sdk/template/azure-template/CHANGELOG.md b/sdk/template/azure-template/CHANGELOG.md
@@ -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
 

diff --git a/sdk/template/azure-template/azure/template/_version.py b/sdk/template/azure-template/azure/template/_version.py
@@ -1,2 +1,2 @@
 # matches SEMVER
-VERSION = "0.0.12"
+VERSION = "0.0.13b1"
diff --git a/sdk/template/azure-template/setup.py b/sdk/template/azure-template/setup.py
@@ -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',