Migrate to use absl from gflags (#1534)

Author: smukherj1

container/BUILD

@@ -43,7 +43,7 @@ py_library(
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
-        "@bazel_tools//third_party/py/gflags",
+        "@io_abseil_py//absl/flags",
         "@rules_pkg//:archive",
     ],
 )

container/build_tar.py

@@ -25,85 +25,86 @@
 import tarfile
 import tempfile
 
+from absl import flags
 from rules_pkg import archive
-from third_party.py import gflags
 
-gflags.DEFINE_string('output', None, 'The output file, mandatory')
-gflags.MarkFlagAsRequired('output')
 
-gflags.DEFINE_multistring('file', [], 'A file to add to the layer')
+flags.DEFINE_string('output', None, 'The output file, mandatory')
+flags.mark_flag_as_required('output')
 
-gflags.DEFINE_string('manifest', None, 'JSON manifest of contents to add to the layer')
+flags.DEFINE_multi_string('file', [], 'A file to add to the layer')
 
-gflags.DEFINE_multistring('empty_file', [], 'An empty file to add to the layer')
+flags.DEFINE_string('manifest', None, 'JSON manifest of contents to add to the layer')
 
-gflags.DEFINE_multistring('empty_dir', [], 'An empty dir to add to the layer')
+flags.DEFINE_multi_string('empty_file', [], 'An empty file to add to the layer')
 
-gflags.DEFINE_string(
+flags.DEFINE_multi_string('empty_dir', [], 'An empty dir to add to the layer')
+
+flags.DEFINE_string(
     'mode', None, 'Force the mode on the added files (in octal).')
 
-gflags.DEFINE_string(
+flags.DEFINE_string(
     'mtime', None, 'Set mtime on tar file entries. May be an integer or the'
         ' value "portable", to get the value 2000-01-01, which is'
         ' usable with non *nix OSes.')
 
-gflags.DEFINE_bool(
+flags.DEFINE_bool(
     'enable_mtime_preservation', False, 'Preserve file mtimes from input tar file.')
 
-gflags.DEFINE_multistring(
+flags.DEFINE_multi_string(
     'empty_root_dir',
     [],
     'An empty root directory to add to the layer.  This will create a directory that'
     'is a peer of "root_directory".  "empty_dir" creates an empty directory inside of'
     '"root_directory"')
 
-gflags.DEFINE_multistring('tar', [], 'A tar file to add to the layer')
+flags.DEFINE_multi_string('tar', [], 'A tar file to add to the layer')
 
-gflags.DEFINE_multistring('deb', [], 'A debian package to add to the layer')
+flags.DEFINE_multi_string('deb', [], 'A debian package to add to the layer')
 
-gflags.DEFINE_multistring(
+flags.DEFINE_multi_string(
     'link', [],
     'Add a symlink a inside the layer ponting to b if a:b is specified')
-gflags.RegisterValidator(
+flags.register_validator(
     'link',
     lambda l: all(value.find(':') > 0 for value in l),
     message='--link value should contains a : separator')
 
-gflags.DEFINE_string(
+flags.DEFINE_string(
     'directory', None, 'Directory in which to store the file inside the layer')
 
-gflags.DEFINE_string(
+flags.DEFINE_string(
     'compression', None, 'Compression (`gz` or `bz2`), default is none.')
 
-gflags.DEFINE_multistring(
+flags.DEFINE_multi_string(
     'modes', None,
     'Specific mode to apply to specific file (from the file argument),'
     ' e.g., path/to/file=0o455.')
 
-gflags.DEFINE_multistring('owners', None,
+flags.DEFINE_multi_string('owners', None,
                           'Specify the numeric owners of individual files, '
                           'e.g. path/to/file=0.0.')
 
-gflags.DEFINE_string('owner', '0.0',
+flags.DEFINE_string('owner', '0.0',
                      'Specify the numeric default owner of all files,'
                      ' e.g., 0.0')
 
-gflags.DEFINE_string('owner_name', None,
+flags.DEFINE_string('owner_name', None,
                      'Specify the owner name of all files, e.g. root.root.')
 
-gflags.DEFINE_multistring('owner_names', None,
+flags.DEFINE_multi_string('owner_names', None,
                           'Specify the owner names of individual files, e.g. '
                           'path/to/file=root.root.')
 
-gflags.DEFINE_string(
+flags.DEFINE_string(
     'root_directory', './', 'Default root directory is named "."'
     'Windows docker images require this be named "Files" instead of "."')
 
-gflags.DEFINE_string('xz_path', None,
+flags.DEFINE_string('xz_path', None,
                      'Specify the path to xz as a fallback when the Python '
                      'lzma module is unavailable.')
 
-FLAGS = gflags.FLAGS
+FLAGS = flags.FLAGS
 
 
 class TarFile(object):

repositories/repositories.bzl

@@ -150,6 +150,41 @@ def repositories():
             urls = ["https://github.com/bazelbuild/rules_pkg/releases/download/0.2.6-1/rules_pkg-0.2.6.tar.gz"],
         )
 
+    if "io_abseil_py" not in excludes:
+        http_archive(
+            name = "io_abseil_py",
+            strip_prefix = "abseil-py-pypi-v0.9.0",
+            sha256 = "603febc9b95a8f2979a7bdb77d2f5e4d9b30d4e0d59579f88eba67d4e4cc5462",
+            urls = ["https://github.com/abseil/abseil-py/archive/pypi-v0.9.0.tar.gz"],
+        )
+
+    # Abseil dependency https://github.com/abseil/abseil-py/blob/f24641ca72815e2643659cb7c8a966e5faa6e580/WORKSPACE#L18
+    if "six_archive" not in excludes:
+        http_archive(
+            name = "six_archive",
+            urls = [
+                "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
+                "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
+            ],
+            sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
+            strip_prefix = "six-1.10.0",
+            build_file_content = """# Description:
+#   Six provides simple utilities for wrapping over differences between Python 2
+#   and Python 3.
+
+licenses(["notice"])  # MIT
+
+exports_files(["LICENSE"])
+
+py_library(
+    name = "six",
+    srcs = ["six.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+)
+""",
+        )
+
     native.register_toolchains(
         # Register the default docker toolchain that expects the 'docker'
         # executable to be in the PATH