Remove __init__.py from bin/ and eval/; add Copybara import rewriting

bin/derive_domain.py

@@ -20,7 +20,7 @@
 from absl import flags
 from absl import logging
 from dpsynth import domain
-from dpsynth.bin import _read_csv_args
+from bin import _read_csv_args
 import fancyflags as ff
 import numpy as np
 import pandas as pd

bin/main.py

@@ -27,7 +27,7 @@
 from absl import app
 from absl import flags
 import dpsynth
-from dpsynth.bin import _read_csv_args
+from bin import _read_csv_args
 import fancyflags as ff
 import pandas as pd
 

bin/run_data_generation.py

@@ -22,7 +22,7 @@
 import apache_beam as beam
 from dpsynth import data_generation
 from dpsynth import domain
-from dpsynth.bin import _proto_class_flag
+from bin import _proto_class_flag
 from dpsynth.dataset_descriptors import csv_descriptor
 from dpsynth.dataset_descriptors import proto_descriptors
 from dpsynth.dataset_descriptors import tfrecord_descriptor

bin/run_tabular_eval.py

@@ -23,8 +23,8 @@
 import apache_beam as beam
 from dpsynth.dataset_descriptors import dataset_descriptor
 from dpsynth.dataset_descriptors import proto_descriptors
-from dpsynth.eval import tabular_eval
-from dpsynth.eval import types
+from eval import tabular_eval
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 from google.protobuf import text_format
 import pandas as pd

eval/attribute_statistics.py

@@ -18,8 +18,8 @@
 import dataclasses
 from typing import Any
 
-from dpsynth.eval import correlation_computation
-from dpsynth.eval import types
+from eval import correlation_computation
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp
 from pipeline_dp import pipeline_functions

eval/correlation_computation.py

@@ -17,7 +17,7 @@
 from collections.abc import Iterable
 import itertools
 from typing import Any
-from dpsynth.eval import types
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import numpy as np
 import pipeline_dp

eval/marginal_total_variance.py

@@ -19,7 +19,7 @@
 import itertools
 from typing import Any
 
-from dpsynth.eval import types
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp
 

eval/one_way_distribution_computation.py

@@ -16,7 +16,7 @@
 
 from collections.abc import Iterable
 from typing import Any
-from dpsynth.eval import types
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import numpy as np
 import pipeline_dp

eval/tabular_eval.py

@@ -17,11 +17,11 @@
 from typing import Any
 
 import apache_beam as beam
-from dpsynth.eval import attribute_statistics
-from dpsynth.eval import correlation_computation
-from dpsynth.eval import marginal_total_variance
-from dpsynth.eval import one_way_distribution_computation
-from dpsynth.eval import types
+from eval import attribute_statistics
+from eval import correlation_computation
+from eval import marginal_total_variance
+from eval import one_way_distribution_computation
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp
 

pyproject.toml

@@ -47,3 +47,6 @@ version = {attr = "dpsynth.__version__"}
 
 [tool.setuptools.packages.find]
 namespaces = false
+
+[tool.pytest.ini_options]
+pythonpath = ["."]

tests/bin/_read_csv_args_test.py

@@ -14,7 +14,7 @@
 
 from absl.testing import absltest
 from absl.testing import parameterized
-from dpsynth.bin import _read_csv_args
+from bin import _read_csv_args
 
 
 class ReadCsvArgsTest(parameterized.TestCase):

tests/bin/derive_domain_test.py

@@ -14,7 +14,7 @@
 
 from absl.testing import absltest
 from dpsynth import domain
-from dpsynth.bin import derive_domain
+from bin import derive_domain
 import numpy as np
 import pandas as pd
 

tests/eval/attribute_statistics_test.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from absl.testing import absltest
-from dpsynth.eval import attribute_statistics
-from dpsynth.eval import types
+from eval import attribute_statistics
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp
 

tests/eval/correlation_computation_test.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from absl.testing import absltest
-from dpsynth.eval import correlation_computation
-from dpsynth.eval import types
+from eval import correlation_computation
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp
 

tests/eval/marginal_total_variance_test.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from absl.testing import absltest
-from dpsynth.eval import marginal_total_variance
+from eval import marginal_total_variance
 import pipeline_dp
 
 

tests/eval/one_way_distribution_computation_test.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from absl.testing import absltest
-from dpsynth.eval import one_way_distribution_computation
+from eval import one_way_distribution_computation
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp
 

tests/eval/tabular_eval_test.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from absl.testing import absltest
-from dpsynth.eval import tabular_eval
-from dpsynth.eval import types
+from eval import tabular_eval
+from eval import types
 from dpsynth.pipeline_transformations import diagnostic_info
 import pipeline_dp