Make data and srcs additive

.gitignore

@@ -22,5 +22,5 @@ bazel-*
 public/
 tmp/
 /**/*.sqlite*
-/**/config.toml
-/**/config.yml
+/**/config*.toml
+/**/config*.yml

tools/python/defs.bzl

@@ -160,6 +160,7 @@ def py_project(name=None,
                main_deps=None,
                main_data=None,
                shebang=None,
+               zip_safe=True,
                lib_srcs=None,
                lib_deps=None,
                lib_data=None,
@@ -177,21 +178,28 @@ def py_project(name=None,
 
     """
 
-    lib_srcs = lib_srcs or native.glob(["src/python/**/*.py"],
+    lib_srcs = (lib_srcs or []) + \
+        native.glob(["src/python/**/*.py"],
                     exclude=[
                         "**/*.pyc",
                     ])
-    lib_data = lib_data or native.glob(["src/resources/**/*",
+
+    lib_data = (lib_data or []) + \
+        native.glob(["src/resources/**/*",
                      "src/python/**/*"],
                     exclude=[
                         "**/*.py",
                         "**/*.pyc",
                     ])
-    test_srcs = test_srcs or native.glob(["test/python/**/*.py"],
+
+    test_srcs = (test_srcs or []) + \
+        native.glob(["test/python/**/*.py"],
                     exclude=[
                         "**/*.pyc",
                     ])
-    test_data = test_data or native.glob(["test/resources/**/*",
+
+    test_data = (test_data or []) + \
+        native.glob(["test/resources/**/*",
                      "test/python/**/*"],
                     exclude=[
                         "**/*.py",
@@ -242,6 +250,7 @@ def py_project(name=None,
                 "//visibility:public",
             ],
             shebang = shebang,
+            zip_safe=zip_safe,
         )
 
     for src in test_srcs: