From 001ba8b9494bb3a39f6480ea25f331ed77856321 Mon Sep 17 00:00:00 2001
From: Mingbo Wan <mingbo@fb.com>
Date: Tue, 3 Dec 2019 11:28:24 -0800
Subject: [PATCH] remove smoke test support for python2.7

---
 .circleci/config.yml        | 30 ------------------------------
 .circleci/config.yml.in     |  2 +-
 .circleci/docker/Dockerfile |  4 +---
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22da6e91b2..cc6fcebd41 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -285,16 +285,6 @@ workflows:
           context: org-member
           requires:
             - nightly_binary_linux_wheel_py2.7
-      - smoke_test_linux_pip:
-          name: nightly_binary_linux_wheel_py2.7_smoke_test_pip
-          python_version: "2.7"
-          requires:
-            - nightly_binary_linux_wheel_py2.7_upload
-      - smoke_test_linux_conda:
-          name: nightly_binary_linux_wheel_py2.7_smoke_test_conda
-          python_version: "2.7"
-          requires:
-            - nightly_binary_linux_wheel_py2.7_upload
           filters:
             branches:
               only: nightly
@@ -310,16 +300,6 @@ workflows:
           context: org-member
           requires:
             - nightly_binary_linux_wheel_py2.7_unicode
-      - smoke_test_linux_pip:
-          name: nightly_binary_linux_wheel_py2.7_unicode_smoke_test_pip
-          python_version: "2.7"
-          requires:
-            - nightly_binary_linux_wheel_py2.7_unicode_upload
-      - smoke_test_linux_conda:
-          name: nightly_binary_linux_wheel_py2.7_unicode_smoke_test_conda
-          python_version: "2.7"
-          requires:
-            - nightly_binary_linux_wheel_py2.7_unicode_upload
           filters:
             branches:
               only: nightly
@@ -477,16 +457,6 @@ workflows:
           context: org-member
           requires:
             - nightly_binary_linux_conda_py2.7
-      - smoke_test_linux_pip:
-          name: nightly_binary_linux_conda_py2.7_smoke_test_pip
-          python_version: "2.7"
-          requires:
-            - nightly_binary_linux_conda_py2.7_upload
-      - smoke_test_linux_conda:
-          name: nightly_binary_linux_conda_py2.7_smoke_test_conda
-          python_version: "2.7"
-          requires:
-            - nightly_binary_linux_conda_py2.7_upload
           filters:
             branches:
               only: nightly
diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
index 4e078a3131..92b896b72e 100644
--- a/.circleci/config.yml.in
+++ b/.circleci/config.yml.in
@@ -228,7 +228,7 @@ jobs:
           requires:
             - {{prefix}}binary_{{os}}_{{btype}}_py{{python_version}}{{ "_unicode" if unicode }}
 {%-       if filter_branch == 'nightly' %}
-{%-         if os == 'linux' %}
+{%-         if os == 'linux' and not python_version.startswith("2.") %}
       - smoke_test_linux_pip:
           name: {{prefix}}binary_{{os}}_{{btype}}_py{{python_version}}{{ "_unicode" if unicode }}_smoke_test_pip
           python_version: "{{python_version}}"
diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile
index 7f8627679a..00ecbd5994 100644
--- a/.circleci/docker/Dockerfile
+++ b/.circleci/docker/Dockerfile
@@ -25,14 +25,12 @@ RUN apt-get -qq update && apt-get -qq -y install curl bzip2 sox libsox-dev libso
 
 ENV PATH /opt/conda/bin:$PATH
 
-RUN conda create -y --name python2.7 python=2.7
 RUN conda create -y --name python3.5 python=3.5
 RUN conda create -y --name python3.6 python=3.6
 RUN conda create -y --name python3.7 python=3.7
 SHELL [ "/bin/bash", "-c" ]
-RUN source /usr/local/etc/profile.d/conda.sh && conda activate python2.7 && conda install -y -c conda-forge sox && conda install -y numpy future
+RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
 RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.5 && conda install -y -c conda-forge sox && conda install -y numpy six
 RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y -c conda-forge sox && conda install -y numpy
 RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y -c conda-forge sox && conda install -y numpy
-RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
 CMD [ "/bin/bash"]