Merge pull request #60 from scikit-build/fix-publish_github_release-a…

…ddon-commit-distance

publish_github_release: Fix support for <COMMIT_DISTANCE>

anyci/publish_github_release.py

@@ -176,7 +176,7 @@ def _substitute_package_selection_strings(package, what, script_args):
         '<PYTHON_WHEEL_PLATFORM>': (python_wheel_platform, [], {}),
         '<COMMIT_DATE>': (get_commit_date, [], {}),
         '<COMMIT_SHORT_SHA>': (get_commit_short_sha, [], {}),
-        '<COMMIT_DISTANCE>': (get_commit_distance, [script_args.prerelease_tag], {})
+        '<COMMIT_DISTANCE>': (get_commit_distance, [script_args.prerelease_release_tag_pattern], {})
     }
     if any([token in package for token in tokens]):
         print("Updating %s [%s]" % (what, package))
@@ -247,6 +247,11 @@ def configure_parser(parser):
         help="Commit or branch name to associate with the pre-release "
              "(default: master)"
     )
+    prerelease_group.add_argument(
+        "--prerelease-release-tag-pattern", type=str,
+        help="Release tag used to compute <COMMIT_DISTANCE>"
+             "(default: *.*.*)"
+    )
     # Common arguments
     parser.add_argument(
         "--token", type=str, metavar="GITHUB_TOKEN",
@@ -276,7 +281,8 @@ def configure_parser(parser):
         prerelease_packages_keep_pattern=None,
         prerelease_name=None,
         prerelease_sha="master",
-        prerelease_tag="latest"
+        prerelease_tag="latest",
+        prerelease_release_tag_pattern="*.*.*"
     )
 
 

anyci/tests/test_publish_github_release.py

@@ -1032,8 +1032,8 @@ def test_substitute_package_selection_strings():
 
         module = __import__(MODULE)
 
-        script_args = namedtuple("script_args", ["prerelease_tag"])
-        script_args.prerelease_tag = "latest"
+        script_args = namedtuple("script_args", ["prerelease_release_tag_pattern"])
+        script_args.prerelease_release_tag_pattern = "*.*.*"
 
         def _test_minilanguage(expected_short_sha=None, expected_date=None, expected_distance=None):
             for package, expected_package in [
@@ -1054,13 +1054,13 @@ def _test_minilanguage(expected_short_sha=None, expected_date=None, expected_dis
                         "distance-%s-shortsha-%s-date-%s.whl" % (expected_distance, expected_short_sha, expected_date)
                 ),
             ]:
-                udpated_package = module._substitute_package_selection_strings(
+                updated_package = module._substitute_package_selection_strings(
                     package, "minilanguage test input", script_args)
 
                 print("")
                 print("expected_package: %s" % expected_package)
-                print(" udpated_package: %s" % udpated_package)
-                assert expected_package == udpated_package
+                print(" updated_package: %s" % updated_package)
+                assert expected_package == updated_package
 
         with PrefixedPrint(MODULE):
 
@@ -1073,15 +1073,16 @@ def _test_minilanguage(expected_short_sha=None, expected_date=None, expected_dis
                 expected_distance="2"
             )
 
-            do_commit(release_tag="latest", push=False)  # 2017-01-03
-            do_commit(push=False)  # 2017-01-04
+            do_commit(release_tag="0.1.0", push=False)  # 2017-01-03
+            do_commit(release_tag="latest", push=False)  # 2017-01-04
             do_commit(push=False)  # 2017-01-05
             do_commit(push=False)  # 2017-01-06
+            do_commit(push=False)  # 2017-01-07
 
             _test_minilanguage(
                 expected_short_sha=get_commit_short_sha(),
-                expected_distance="3",
-                expected_date="20170106"
+                expected_distance="4",
+                expected_date="20170107"
             )
 
     test_prerelease_mode()