Drop support for py 2.7, make tests that were running on 2.7 run on py3 instead.

PiperOrigin-RevId: 289171890

Author: afrozenator

.travis.yml

@@ -7,7 +7,6 @@ git:
 services:
   - docker
 python:
-  - "2.7"
   - "3.6"
 env:
   global:

oss_scripts/oss_integration_test.sh

@@ -20,7 +20,7 @@ t2t-trainer --problem=$T2T_PROBLEM --data_dir=$T2T_DATA_DIR --model=transformer
 t2t-decoder --problem=$T2T_PROBLEM --data_dir=$T2T_DATA_DIR --model=transformer --hparams_set=transformer_tiny --output_dir=$T2T_TRAIN_DIR --decode_hparams='num_samples=10'
 
 # Test serving
-if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]] && [[ "$TF_VERSION" == "$TF_LATEST"  ]]
+if [[ "$TF_VERSION" == "$TF_LATEST"  ]]
 then
   # Export for serving
   pip install tensorflow_hub

oss_scripts/oss_tests.sh

@@ -158,19 +158,7 @@ set_status
 #  set_status
 #fi
 
-if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]] && [[ "$TF_VERSION" == "$TF_LATEST"  ]]
-then
-    # TODO(afrozm): Once we drop support for 1.10 we can get rid of this.
-    pytest --disable-warnings \
-      tensor2tensor/utils/beam_search_test.py::BeamSearchTest::testTPUBeam
-    set_status
-    # TODO(afrozm): Enable other tests in the RL directory.
-    # Can't add disable warning here since it parses flags.
-    pytest tensor2tensor/rl/trainer_model_based_test.py
-    set_status
-fi
-
-if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]] && [[ "$TF_VERSION" == "$TF_LATEST"  ]]
+if [[ "$TF_VERSION" == "$TF_LATEST"  ]]
 then
     jupyter nbconvert --ExecutePreprocessor.kernel_name=python3 \
       --ExecutePreprocessor.timeout=600 --to notebook --execute \
@@ -181,6 +169,17 @@ then
       --ExecutePreprocessor.timeout=600 --to notebook --execute \
       tensor2tensor/notebooks/t2t_problem.ipynb;
     set_status
+
+    # TODO(afrozm): Once we drop support for 1.10 we can get rid of this.
+    pytest --disable-warnings \
+      tensor2tensor/utils/beam_search_test.py::BeamSearchTest::testTPUBeam
+    set_status
+
+    # TODO(afrozm): Enable other tests in the RL directory.
+    # Can't add disable warning here since it parses flags.
+    pytest tensor2tensor/rl/trainer_model_based_test.py
+    set_status
+
 fi
 
 # Test --t2t_usr_dir