Merge pull request #3204 from cortesi/nurelease

cibuild: cater for tags with "v" prefix

1 files changed, 48 insertions, 13 deletions

diff --git a/test/release/test_cibuild.py b/test/release/test_cibuild.py
index efa2f072..96280e35 100644
--- a/test/release/test_cibuild.py
+++ b/test/release/test_cibuild.py
@@ -36,6 +36,14 @@ def test_buildenviron_common():
     with pytest.raises(cibuild.BuildError):
         be.platform_tag
 
+    with pytest.raises(ValueError, match="TRAVIS_TAG"):
+        be = cibuild.BuildEnviron(
+            system="Linux",
+            root_dir="/foo",
+            travis_tag="one",
+            travis_branch="two",
+        )
+
 
 def test_buildenviron_pr():
     # Simulates a PR. We build everything, but don't have access to secret
@@ -82,8 +90,8 @@ def test_buildenviron_releasetag():
     be = cibuild.BuildEnviron(
         system="Linux",
         root_dir="/foo",
-        travis_tag="0.0.1",
-        travis_branch="v0.x",
+        travis_tag="v0.0.1",
+        travis_branch="v0.0.1",
         should_build_wheel=True,
         should_build_docker=True,
         should_build_pyinstaller=True,
@@ -91,8 +99,8 @@ def test_buildenviron_releasetag():
         docker_username="foo",
         docker_password="bar",
     )
-    assert be.tag == "0.0.1"
-    assert be.branch == "v0.x"
+    assert be.tag == "v0.0.1"
+    assert be.branch == "v0.0.1"
     assert be.version == "0.0.1"
     assert be.upload_dir == "0.0.1"
     assert be.docker_tag == "mitmproxy/mitmproxy:0.0.1"
@@ -101,8 +109,32 @@ def test_buildenviron_releasetag():
     assert be.is_prod_release
 
 
+def test_buildenviron_namedtag():
+    # Simulates a non-release tag on a branch.
+    be = cibuild.BuildEnviron(
+        system="Linux",
+        root_dir="/foo",
+        travis_tag="anyname",
+        travis_branch="anyname",
+        should_build_wheel=True,
+        should_build_docker=True,
+        should_build_pyinstaller=True,
+        has_twine_creds=True,
+        docker_username="foo",
+        docker_password="bar",
+    )
+    assert be.tag == "anyname"
+    assert be.branch == "anyname"
+    assert be.version == "anyname"
+    assert be.upload_dir == "anyname"
+    assert be.docker_tag == "mitmproxy/mitmproxy:anyname"
+    assert not be.should_upload_pypi
+    assert not be.should_upload_docker
+    assert not be.is_prod_release
+
+
 def test_buildenviron_branch():
-    # Simulates a development branch on the main repo
+    # Simulates a commit on a development branch on the main repo
     be = cibuild.BuildEnviron(
         system="Linux",
         root_dir="/foo",
@@ -128,7 +160,7 @@ def test_buildenviron_osx(tmpdir):
         system="Darwin",
         root_dir="/foo",
         travis_tag="0.0.1",
-        travis_branch="v0.x",
+        travis_branch="0.0.1",
     )
     assert be.platform_tag == "osx"
     assert be.bdists == {
@@ -146,8 +178,8 @@ def test_buildenviron_windows(tmpdir):
     be = cibuild.BuildEnviron(
         system="Windows",
         root_dir="/foo",
-        travis_tag="0.0.1",
-        travis_branch="v0.x",
+        travis_tag="v0.0.1",
+        travis_branch="v0.0.1",
     )
     assert be.platform_tag == "windows"
     assert be.bdists == {
@@ -163,18 +195,21 @@ def test_buildenviron_windows(tmpdir):
 
 @pytest.mark.parametrize("version, tag, ok", [
     ("3.0.0.dev", "", True),  # regular snapshot
-    ("3.0.0.dev", "3.0.0", False),  # forgot to remove ".dev" on bump
+    ("3.0.0.dev", "v3.0.0", False),  # forgot to remove ".dev" on bump
     ("3.0.0", "", False),  # forgot to re-add ".dev"
-    ("3.0.0", "4.0.0", False),  # version mismatch
-    ("3.0.0", "3.0.0", True),  # regular release
-    ("3.0.0.rc1", "3.0.0.rc1", False),  # non-canonical.
+    ("3.0.0", "v4.0.0", False),  # version mismatch
+    ("3.0.0", "v3.0.0", True),  # regular release
+    ("3.0.0.rc1", "v3.0.0.rc1", False),  # non-canonical.
+    ("3.0.0.dev", "anyname", True),  # tagged test/dev release
+    ("3.0.0", "3.0.0", False),  # tagged, but without v prefix
 ])
 def test_buildenviron_check_version(version, tag, ok, tmpdir):
     tmpdir.mkdir("mitmproxy").join("version.py").write(f'VERSION = "{version}"')
 
     be = cibuild.BuildEnviron(
         root_dir=tmpdir,
-        travis_tag=tag
+        travis_tag=tag,
+        travis_branch=tag
     )
     if ok:
         be.check_version()