Skip to content

Commit 38f1e87

Browse files
mingbowanvincentqb
authored andcommitted
remove smoke test support for python2.7 (#359)
1 parent 2c7fdcc commit 38f1e87

File tree

3 files changed

+2
-34
lines changed

3 files changed

+2
-34
lines changed

.circleci/config.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,6 @@ workflows:
285285
context: org-member
286286
requires:
287287
- nightly_binary_linux_wheel_py2.7
288-
- smoke_test_linux_pip:
289-
name: nightly_binary_linux_wheel_py2.7_smoke_test_pip
290-
python_version: "2.7"
291-
requires:
292-
- nightly_binary_linux_wheel_py2.7_upload
293-
- smoke_test_linux_conda:
294-
name: nightly_binary_linux_wheel_py2.7_smoke_test_conda
295-
python_version: "2.7"
296-
requires:
297-
- nightly_binary_linux_wheel_py2.7_upload
298288
filters:
299289
branches:
300290
only: nightly
@@ -310,16 +300,6 @@ workflows:
310300
context: org-member
311301
requires:
312302
- nightly_binary_linux_wheel_py2.7_unicode
313-
- smoke_test_linux_pip:
314-
name: nightly_binary_linux_wheel_py2.7_unicode_smoke_test_pip
315-
python_version: "2.7"
316-
requires:
317-
- nightly_binary_linux_wheel_py2.7_unicode_upload
318-
- smoke_test_linux_conda:
319-
name: nightly_binary_linux_wheel_py2.7_unicode_smoke_test_conda
320-
python_version: "2.7"
321-
requires:
322-
- nightly_binary_linux_wheel_py2.7_unicode_upload
323303
filters:
324304
branches:
325305
only: nightly
@@ -477,16 +457,6 @@ workflows:
477457
context: org-member
478458
requires:
479459
- nightly_binary_linux_conda_py2.7
480-
- smoke_test_linux_pip:
481-
name: nightly_binary_linux_conda_py2.7_smoke_test_pip
482-
python_version: "2.7"
483-
requires:
484-
- nightly_binary_linux_conda_py2.7_upload
485-
- smoke_test_linux_conda:
486-
name: nightly_binary_linux_conda_py2.7_smoke_test_conda
487-
python_version: "2.7"
488-
requires:
489-
- nightly_binary_linux_conda_py2.7_upload
490460
filters:
491461
branches:
492462
only: nightly

.circleci/config.yml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
requires:
229229
- {{prefix}}binary_{{os}}_{{btype}}_py{{python_version}}{{ "_unicode" if unicode }}
230230
{%- if filter_branch == 'nightly' %}
231-
{%- if os == 'linux' %}
231+
{%- if os == 'linux' and not python_version.startswith("2.") %}
232232
- smoke_test_linux_pip:
233233
name: {{prefix}}binary_{{os}}_{{btype}}_py{{python_version}}{{ "_unicode" if unicode }}_smoke_test_pip
234234
python_version: "{{python_version}}"

.circleci/docker/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ RUN apt-get -qq update && apt-get -qq -y install curl bzip2 sox libsox-dev libso
2525

2626
ENV PATH /opt/conda/bin:$PATH
2727

28-
RUN conda create -y --name python2.7 python=2.7
2928
RUN conda create -y --name python3.5 python=3.5
3029
RUN conda create -y --name python3.6 python=3.6
3130
RUN conda create -y --name python3.7 python=3.7
3231
SHELL [ "/bin/bash", "-c" ]
33-
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
32+
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
3433
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
3534
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.6 && conda install -y -c conda-forge sox && conda install -y numpy
3635
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.7 && conda install -y -c conda-forge sox && conda install -y numpy
37-
RUN echo "source /usr/local/etc/profile.d/conda.sh" >> ~/.bashrc
3836
CMD [ "/bin/bash"]

0 commit comments

Comments
 (0)