Update

build_tools/conda_build.py

@@ -15,20 +15,10 @@
 from release_tools import clone_repo, prepare_recipe_in_local_feedstock_repo
 from release_tools import prepare_recipe_in_local_repo, rerender, do_build
 from release_tools import rerender_in_local_feedstock, build_in_local_feedstock
-from release_tools import rerender_in_local_repo, build_in_local_repo
-
-p = subprocess.Popen(["git", "rev-parse", "--short", "HEAD"], stdout=subprocess.PIPE)
-git_rev_parse = p.stdout.read().decode('utf-8')
-git_rev = "g{0}".format(git_rev_parse).strip()
-print("git_rev: {g}".format(g=git_rev))
-if "VERSION" in os.environ.keys():
-    last_stable=os.environ['VERSION']
-else:
-    last_stable = "8.2"
+from release_tools import rerender_in_local_repo, build_in_local_repo, get_git_rev
 
-l = time.localtime()
-today = "%s.%.2i.%.2i.%.2i.%.2i.%.2i.%s" % (last_stable, l.tm_year, l.tm_mon, l.tm_mday, l.tm_hour, l.tm_min, git_rev)
 
+l = time.localtime()
 cwd = os.getcwd()
 
 #
@@ -68,9 +58,9 @@
 parser.add_argument("-r", "--repo_name",
                     help="repo name to build")
 parser.add_argument("-b", "--branch", default='master', help="branch to build")
-parser.add_argument("-v", "--version", default=today,
+parser.add_argument("-v", "--version",
                     help="version are we building for")
-parser.add_argument("-l", "--last_stable", default=last_stable,
+parser.add_argument("-l", "--last_stable",
                     help="last stable (released) version, specify this when building for nightly")
 parser.add_argument("-w", "--workdir", default=cwd, help="work full path directory")
 parser.add_argument("-B", "--build", default="0", help="build number, this should be 0 for nightly")
@@ -83,7 +73,6 @@
 
 pkg_name = args.package_name
 branch = args.branch
-last_stable = args.last_stable
 workdir = args.workdir
 build = args.build
 do_conda_clean = args.conda_clean
@@ -93,23 +82,27 @@
 else:
     repo_name = pkg_name
 
-today2 = "%s.%.2i.%.2i.%.2i.%.2i.%.2i.%s" % (args.last_stable, l.tm_year, l.tm_mon, l.tm_mday, l.tm_hour, l.tm_min, git_rev)
-if args.version != today:
-    # we are building for a release of a non conda-forge package
-    version = args.version
-else:
-    # we are building for nightly
-    version = today2
-
-print("XXX XXX XXX version: {v}".format(v=version))
-
 # github organization of projects
 organization = args.github_organization_name
 
 # for calling run_cmds
 join_stderr = True
 shell_cmd = False
 verbose = True
+version = None
+
+def construct_pkg_ver(repo_dir, arg_version, arg_last_stable):
+    git_rev = get_git_rev(repo_dir)
+    if arg_version:
+        # we are building for a release of a non conda-forge package
+        version = arg_version
+    else:
+        # we are building for nightly
+        today2 = "%s.%.2i.%.2i.%.2i.%.2i.%.2i.%s" % (arg_last_stable, l.tm_year, l.tm_mon, l.tm_mday, l.tm_hour, l.tm_min, git_rev)
+        version = today2
+
+    print("XXX version: {v}".format(v=version))
+    return version
 
 #
 # main
@@ -125,6 +118,13 @@
     ret, repo_dir = clone_repo(organization, repo_name, branch, workdir)
     if ret != SUCCESS:
         sys.exit(ret)
+    print("DEBUG DEBUG...calling construct_pkg_ver()")
+    version = construct_pkg_ver(repo_dir, args.version, args.last_stable)
+    print("DEBUG DEBUG...construct_pkg_ver() returned version: {v}".format(v=version))
+
+else:
+    repo_dir = "{w}/{p}".format(w=workdir, p=repo_name)
+
 
 if is_conda_forge_pkg:
     if args.do_rerender:

build_tools/release_tools.py

@@ -16,6 +16,13 @@
 verbose = True
 not_verbose = False
 
+def get_git_rev(repo_dir):
+    cmd = "git rev-parse --short HEAD"
+    ret_code, out = run_cmd_capture_output(cmd, join_stderr, shell_cmd, not_verbose, repo_dir)
+    git_rev = "g{r}".format(r=out[0])
+    print("XXX XXX DEBUG...get_git_rev: {g}".format(g=git_rev))
+    return(git_rev)
+
 def get_latest_tag(repo_dir):
     cmd = "git ls-remote --tags origin"
 
@@ -209,12 +216,11 @@ def rerender(dir):
 
     cmd = "conda smithy rerender"
     ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir)
-    if ret != SUCCESS:
-        return ret
+
     return ret
 
 def do_build(dir, py_version):
-    print("...do_build...")
+    print("...do_build..., py_version: {v}".format(v=py_version))
     ret = SUCCESS
     variant_files_dir = os.path.join(dir, ".ci_support")
     if py_version == "noarch":