Fix / disable a few more tests that don't work with v2

tensorflow/examples/adding_an_op/cuda_op.py

@@ -23,5 +23,5 @@ import tensorflow as tf
 
 if tf.test.is_built_with_cuda():
   _cuda_op_module = tf.load_op_library(os.path.join(
-      tf.resource_loader.get_data_files_path(), 'cuda_op_kernel.so'))
+      tf.compat.v1.resource_loader.get_data_files_path(), 'cuda_op_kernel.so'))
   add_one = _cuda_op_module.add_one

tensorflow/python/distribute/BUILD

@@ -882,7 +882,6 @@ distribute_py_test(
     deps = [
         ":mirrored_strategy",
         ":single_loss_example",
-        "//tensorflow/contrib/tpu:tpu_lib",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:control_flow_v2_toggles",
         "//tensorflow/python:framework_ops",

tensorflow/python/profiler/model_analyzer_test.py

@@ -462,6 +462,7 @@ class PrintModelAnalysisTest(test.TestCase):
       self.assertTrue(has_rnn)
       self.assertTrue(has_loop)
 
+  @test_util.run_v1_only('b/139088991')
   def testPprof(self):
     for attr in ['micros', 'bytes', 'accelerator_micros', 'cpu_micros',
                  'params', 'float_ops']:

tensorflow/tools/pip_package/BUILD

@@ -95,6 +95,7 @@ COMMON_PIP_DEPS = [
     "//tensorflow/python/saved_model:saved_model",
     "//tensorflow/python/tools:tools_pip",
     "//tensorflow/python/tools/api/generator:create_python_api",
+    "//tensorflow/python/tpu:tpu",
     "//tensorflow/python/tpu:tpu_lib",
     "//tensorflow/python:test_ops",
     "//tensorflow/python:while_v2",