From 0ea82cf989883ec0772da086b91b5f5a4754285f Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Sat, 10 Dec 2016 13:43:05 -0800 Subject: [PATCH 1/2] Fixing regex for package deployment. --- circle.yml | 2 +- scripts/circleci_tagged_pkg.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index dad5df83ec38..192487423672 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,7 @@ general: deployment: release: - tag: /(([a-z]+)-)?([0-9]+)\.([0-9]+)\.([0-9]+)/ + tag: /(([a-z]+)-)*([0-9]+)\.([0-9]+)\.([0-9]+)/ owner: GoogleCloudPlatform commands: - pip install --upgrade twine diff --git a/scripts/circleci_tagged_pkg.py b/scripts/circleci_tagged_pkg.py index 0d6b7a3485dd..3df648b818de 100644 --- a/scripts/circleci_tagged_pkg.py +++ b/scripts/circleci_tagged_pkg.py @@ -24,7 +24,7 @@ import sys -RE_TXT = r'^((?P[a-z]+)-)?([0-9]+)\.([0-9]+)\.([0-9]+)$' +RE_TXT = r'^(?P(([a-z]+)-)*)([0-9]+)\.([0-9]+)\.([0-9]+)$' TAG_RE = re.compile(RE_TXT) TAG_ENV = 'CIRCLE_TAG' ERROR_MSG = '%s env. var. not set' % (TAG_ENV,) @@ -52,7 +52,7 @@ def main(): if pkg_name is None: print(ROOT_DIR) else: - pkg_dir = pkg_name.replace('-', '_') + pkg_dir = pkg_name.rstrip('-').replace('-', '_') print(os.path.join(ROOT_DIR, pkg_dir)) From 358c51e25989608711bc20e862623bc52c755e4a Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 15 Dec 2016 22:47:43 -0800 Subject: [PATCH 2/2] Using more descriptive REG-EX. --- circle.yml | 1 + scripts/circleci_tagged_pkg.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 192487423672..9ff6c2db10d2 100644 --- a/circle.yml +++ b/circle.yml @@ -24,6 +24,7 @@ general: deployment: release: + # See "scripts/circleci_tagged_pkg.py" for info on REGEX tag: /(([a-z]+)-)*([0-9]+)\.([0-9]+)\.([0-9]+)/ owner: GoogleCloudPlatform commands: diff --git a/scripts/circleci_tagged_pkg.py b/scripts/circleci_tagged_pkg.py index 3df648b818de..ba7c99f522d8 100644 --- a/scripts/circleci_tagged_pkg.py +++ b/scripts/circleci_tagged_pkg.py @@ -24,11 +24,16 @@ import sys -RE_TXT = r'^(?P(([a-z]+)-)*)([0-9]+)\.([0-9]+)\.([0-9]+)$' -TAG_RE = re.compile(RE_TXT) +TAG_RE = re.compile(r""" + ^ + (?P + (([a-z]+)-)*) # pkg-name-with-hyphens- (empty allowed) + ([0-9]+)\.([0-9]+)\.([0-9]+) # Version x.y.z (x, y, z all ints) + $ +""", re.VERBOSE) TAG_ENV = 'CIRCLE_TAG' ERROR_MSG = '%s env. var. not set' % (TAG_ENV,) -BAD_TAG_MSG = 'Invalid tag name: %s. Expected ' + RE_TXT +BAD_TAG_MSG = 'Invalid tag name: %s. Expected pkg-name-x.y.z' _SCRIPTS_DIR = os.path.dirname(__file__) ROOT_DIR = os.path.abspath(os.path.join(_SCRIPTS_DIR, '..'))