From 944b1815271ab839586483f001cc7a2fc9df1136 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Thu, 6 Feb 2020 12:23:28 -0800 Subject: [PATCH 01/16] do ls -l .ci_support after rerender --- build_tools/release_tools.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index 7786afe..0e87b30 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -211,6 +211,10 @@ def rerender(dir): ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir) if ret != SUCCESS: return ret + + cmd = "ls -l {d}/.ci_support" + ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir) + return ret def do_build(dir, py_version): From 988ef30f538439336a145d6aed00d90f131ab044 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Thu, 6 Feb 2020 12:39:12 -0800 Subject: [PATCH 02/16] do ls -l .ci_support after rerender --- build_tools/release_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index 0e87b30..0d504ad 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -212,7 +212,7 @@ def rerender(dir): if ret != SUCCESS: return ret - cmd = "ls -l {d}/.ci_support" + cmd = "ls -l {d}/.ci_support".format(d=dir) ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir) return ret From 26760acd1cfc92474d27e4c316b0486030d927ac Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Thu, 6 Feb 2020 13:00:28 -0800 Subject: [PATCH 03/16] do ls -l .ci_support after rerender --- build_tools/release_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index 0d504ad..d6777d0 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -212,7 +212,7 @@ def rerender(dir): if ret != SUCCESS: return ret - cmd = "ls -l {d}/.ci_support".format(d=dir) + cmd = "ls -l {d}/.ci_support/*".format(d=dir) ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir) return ret From 5bea664dfb1179a84f74da45dc7a009ee90a6cfa Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Thu, 6 Feb 2020 13:27:01 -0800 Subject: [PATCH 04/16] do ls -l .ci_support after rerender --- build_tools/release_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index d6777d0..11205fa 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -213,7 +213,7 @@ def rerender(dir): return ret cmd = "ls -l {d}/.ci_support/*".format(d=dir) - ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir) + ret = run_cmd(cmd, join_stderr, shell_cmd, verbose) return ret From 246b5012c50ee3fca6f1f0d0bfae3d87b55f376f Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Thu, 6 Feb 2020 13:54:53 -0800 Subject: [PATCH 05/16] cleanup --- build_tools/release_tools.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index 11205fa..b8c243b 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -209,11 +209,6 @@ def rerender(dir): cmd = "conda smithy rerender" ret = run_cmd(cmd, join_stderr, shell_cmd, verbose, dir) - if ret != SUCCESS: - return ret - - cmd = "ls -l {d}/.ci_support/*".format(d=dir) - ret = run_cmd(cmd, join_stderr, shell_cmd, verbose) return ret From 7c07e7a99511c04005c09fbaa7a97636602a5bc2 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Thu, 6 Feb 2020 14:07:25 -0800 Subject: [PATCH 06/16] add debug --- build_tools/release_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index b8c243b..cf239f4 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -213,7 +213,7 @@ def rerender(dir): 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": From b01292f1aebf50b5a75bb7dfcf95a17e67c557d4 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 09:55:37 -0800 Subject: [PATCH 07/16] added get_git_rev() --- build_tools/conda_build.py | 29 +++++++++++++++++------------ build_tools/release_tools.py | 7 +++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index c74363b..e2b3d5f 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -27,7 +27,7 @@ last_stable = "8.2" 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) +##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) cwd = os.getcwd() @@ -68,7 +68,7 @@ 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, help="last stable (released) version, specify this when building for nightly") @@ -93,16 +93,6 @@ 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 @@ -110,6 +100,19 @@ join_stderr = True shell_cmd = False verbose = True +version = None + +def construct_pkg_ver(repo_dir): + git_rev = get_git_rev(repo_dir) + 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: + # 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)) # # main @@ -126,6 +129,8 @@ if ret != SUCCESS: sys.exit(ret) + version = construct_pkg_ver(repo_dir) + if is_conda_forge_pkg: if args.do_rerender: status = clone_feedstock(pkg_name, workdir) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index cf239f4..5fc0726 100644 --- a/build_tools/release_tools.py +++ b/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 = 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" From 2e6ea3ac48e9e9df8c0d08aab4ee91e5f4dfe2d5 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 12:14:16 -0800 Subject: [PATCH 08/16] more cleanup --- build_tools/conda_build.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index e2b3d5f..8e50945 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -17,14 +17,15 @@ 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" +##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" 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) @@ -113,7 +114,7 @@ def construct_pkg_ver(repo_dir): version = today2 print("XXX XXX XXX version: {v}".format(v=version)) - + return version # # main # @@ -129,7 +130,10 @@ def construct_pkg_ver(repo_dir): if ret != SUCCESS: sys.exit(ret) - version = construct_pkg_ver(repo_dir) +else: + repo_dir = "{w}/{p}".format(w=workdir, p=repo_name) + +version = construct_pkg_ver(repo_dir) if is_conda_forge_pkg: if args.do_rerender: From 029a4f0eb2fb469bc3d3d43b50c7afa4a92e9978 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 12:36:19 -0800 Subject: [PATCH 09/16] more cleanup --- build_tools/conda_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index 8e50945..bb3646a 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -129,11 +129,11 @@ def construct_pkg_ver(repo_dir): ret, repo_dir = clone_repo(organization, repo_name, branch, workdir) if ret != SUCCESS: sys.exit(ret) + version = construct_pkg_ver(repo_dir) else: repo_dir = "{w}/{p}".format(w=workdir, p=repo_name) -version = construct_pkg_ver(repo_dir) if is_conda_forge_pkg: if args.do_rerender: From 25e86abba22f622a91e0dc76fec30b777f6a7100 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 14:21:25 -0800 Subject: [PATCH 10/16] added debug --- build_tools/conda_build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index bb3646a..ffcea96 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -113,7 +113,7 @@ def construct_pkg_ver(repo_dir): # we are building for nightly version = today2 - print("XXX XXX XXX version: {v}".format(v=version)) + print("XXX DEBUG XXX XXX XXX version: {v}".format(v=version)) return version # # main @@ -129,7 +129,9 @@ def construct_pkg_ver(repo_dir): 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) + print("DEBUG DEBUG...construct_pkg_ver() returned version: {v}".format(v=version)) else: repo_dir = "{w}/{p}".format(w=workdir, p=repo_name) From 07dbcb661434e2f4e2a4c1106a6e3e80b01b43bf Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 14:47:39 -0800 Subject: [PATCH 11/16] added debug --- build_tools/conda_build.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index ffcea96..2dd6872 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -71,7 +71,7 @@ parser.add_argument("-b", "--branch", default='master', help="branch to build") 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") @@ -84,7 +84,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 @@ -103,18 +102,19 @@ verbose = True version = None -def construct_pkg_ver(repo_dir): +def construct_pkg_ver(repo_dir, arg_version, arg_last_stable): git_rev = get_git_rev(repo_dir) - 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: + if arg_version: # we are building for a release of a non conda-forge package - version = args.version + 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 DEBUG XXX XXX XXX version: {v}".format(v=version)) return version + # # main # @@ -130,7 +130,7 @@ def construct_pkg_ver(repo_dir): if ret != SUCCESS: sys.exit(ret) print("DEBUG DEBUG...calling construct_pkg_ver()") - version = construct_pkg_ver(repo_dir) + version = construct_pkg_ver(repo_dir, arg.version, arg.last_stable) print("DEBUG DEBUG...construct_pkg_ver() returned version: {v}".format(v=version)) else: From b53f3c39250ee7b0254a3ccd74708f337e1110ee Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 15:11:28 -0800 Subject: [PATCH 12/16] fixed call to construct_pkg_ver() --- build_tools/conda_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index 2dd6872..c668e8f 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -130,7 +130,7 @@ def construct_pkg_ver(repo_dir, arg_version, arg_last_stable): if ret != SUCCESS: sys.exit(ret) print("DEBUG DEBUG...calling construct_pkg_ver()") - version = construct_pkg_ver(repo_dir, arg.version, arg.last_stable) + version = construct_pkg_ver(repo_dir, args.version, args.last_stable) print("DEBUG DEBUG...construct_pkg_ver() returned version: {v}".format(v=version)) else: From 2a7bf5324d0eed093a483d02a9dd36a6bdd9b9ef Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 15:16:41 -0800 Subject: [PATCH 13/16] import get_git_rev --- build_tools/conda_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index c668e8f..8d9524d 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -15,7 +15,7 @@ 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 +from release_tools import rerender_in_local_repo, build_in_local_repo, get_git_rev ##p = subprocess.Popen(["git", "rev-parse", "--short", "HEAD"], stdout=subprocess.PIPE) ##git_rev_parse = p.stdout.read().decode('utf-8') From 4e7faf54672bfb1f2f9eca987015eb8426e8ab3a Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 7 Feb 2020 15:24:34 -0800 Subject: [PATCH 14/16] fixed get_git_rev() --- build_tools/release_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index 5fc0726..0d14e99 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -19,7 +19,7 @@ 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 = out[0] + git_rev = "g{r}".format(r=out[0]) print("XXX XXX DEBUG...get_git_rev: {g}".format(g=git_rev)) return(git_rev) From 4794b4faa2b56142e4151797d445bd738e61c8c6 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Tue, 25 Feb 2020 15:01:10 -0800 Subject: [PATCH 15/16] remove comments --- build_tools/conda_build.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index 8d9524d..504f575 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -17,19 +17,8 @@ from release_tools import rerender_in_local_feedstock, build_in_local_feedstock from release_tools import rerender_in_local_repo, build_in_local_repo, get_git_rev -##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" 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) - cwd = os.getcwd() # @@ -112,7 +101,7 @@ def construct_pkg_ver(repo_dir, arg_version, arg_last_stable): 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 DEBUG XXX XXX XXX version: {v}".format(v=version)) + print("XXX version: {v}".format(v=version)) return version # From cd08c3685d62be6434f02cab9a2cd1ce918120b0 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Tue, 25 Feb 2020 15:08:43 -0800 Subject: [PATCH 16/16] removed debug prints --- build_tools/conda_build.py | 4 ---- build_tools/release_tools.py | 1 - 2 files changed, 5 deletions(-) diff --git a/build_tools/conda_build.py b/build_tools/conda_build.py index 504f575..c606f57 100644 --- a/build_tools/conda_build.py +++ b/build_tools/conda_build.py @@ -101,7 +101,6 @@ def construct_pkg_ver(repo_dir, arg_version, arg_last_stable): 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 # @@ -118,10 +117,7 @@ def construct_pkg_ver(repo_dir, arg_version, arg_last_stable): 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) diff --git a/build_tools/release_tools.py b/build_tools/release_tools.py index 0d14e99..78cbfcb 100644 --- a/build_tools/release_tools.py +++ b/build_tools/release_tools.py @@ -20,7 +20,6 @@ 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):