[BEAM-7015] Remove duplicate standard_coders.yaml

.gitignore

@@ -42,6 +42,7 @@ sdks/python/LICENSE
 sdks/python/NOTICE
 sdks/python/README.md
 sdks/python/apache_beam/portability/api/*pb2*.*
+sdks/python/apache_beam/portability/api/*.yaml
 sdks/python/nosetests.xml
 sdks/python/postcommit_requirements.txt
 

sdks/python/apache_beam/coders/standard_coders_test.py

@@ -37,8 +37,8 @@
 from apache_beam.utils import windowed_value
 from apache_beam.utils.timestamp import Timestamp
 
-STANDARD_CODERS_YAML = os.path.join(
-    os.path.dirname(__file__), '..', 'testing', 'data', 'standard_coders.yaml')
+STANDARD_CODERS_YAML = os.path.normpath(os.path.join(
+    os.path.dirname(__file__), '../portability/api/standard_coders.yaml'))
 
 
 def _load_test_cases(test_yaml):
@@ -76,7 +76,7 @@ class StandardCodersTest(unittest.TestCase):
       'beam:coder:timer:v1':
           lambda x, payload_parser: dict(
               payload=payload_parser(x['payload']),
-              timestamp=Timestamp(micros=x['timestamp'])),
+              timestamp=Timestamp(micros=x['timestamp'] * 1000)),
       'beam:coder:double:v1': lambda x: float(x),
   }
 

sdks/python/gen_protos.py

@@ -43,6 +43,11 @@
 
 PYTHON_OUTPUT_PATH = os.path.join('apache_beam', 'portability', 'api')
 
+MODEL_RESOURCES = [
+    os.path.normpath('../../model/fn-execution/src/main/resources'\
+            + '/org/apache/beam/model/fnexecution/v1/standard_coders.yaml'),
+]
+
 
 def generate_proto_files(force=False):
 
@@ -114,6 +119,10 @@ def generate_proto_files(force=False):
             'Protoc returned non-zero status (see logs for details): '
             '%s' % ret_code)
 
+    # copy resource files
+    for path in MODEL_RESOURCES:
+      shutil.copy2(os.path.join(py_sdk_root, path), out_dir)
+
     ret_code = subprocess.call(["pip", "install", "future==0.16.0"])
     if ret_code:
       raise RuntimeError(

sdks/python/setup.py

@@ -185,7 +185,8 @@ def run(self):
     author_email=PACKAGE_EMAIL,
     packages=setuptools.find_packages(),
     package_data={'apache_beam': [
-        '*/*.pyx', '*/*/*.pyx', '*/*.pxd', '*/*/*.pxd', 'testing/data/*.yaml']},
+        '*/*.pyx', '*/*/*.pyx', '*/*.pxd', '*/*/*.pxd', 'testing/data/*.yaml',
+        'portability/api/*.yaml']},
     ext_modules=cythonize([
         'apache_beam/**/*.pyx',
         'apache_beam/coders/coder_impl.py',