Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand Down
4 changes: 1 addition & 3 deletions .circleci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]