Commit 11850f7a authored by nd-02110114's avatar nd-02110114
Browse files

💚 fix ci

parent 697865f1
Loading
Loading
Loading
Loading
+30 −30
Original line number Diff line number Diff line
jobs:
  include:
    - name: 'Python 3.6'
    - name: "Python 3.6"
      language: python
      python: '3.6'
      python: "3.6"
      sudo: required
      dist: xenial

    - name: 'Python 3.7'
    - name: "Python 3.7"
      language: python
      python: '3.7'
      python: "3.7"
      sudo: required
      dist: xenial

    - name: 'Windows'
    - name: "Windows"
      language: c # Not really, but travis doesn't support python on Windows
      python: '3.7'
      python: "3.7"
      os: windows

install:
  - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O anaconda.sh;
    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
    export python_version=$TRAVIS_PYTHON_VERSION;
    bash anaconda.sh -b -p $HOME/anaconda;
    export PATH="$HOME/anaconda/bin:$PATH";
    bash miniconda.sh -b -p $HOME/miniconda;
    source "$HOME/miniconda/etc/profile.d/conda.sh";
    fi
  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
    choco install miniconda3 --params="'/JustMe /AddToPath:1'";
@@ -34,7 +34,7 @@ install:
  - conda update -q conda
  - conda config --add channels http://conda.binstar.org/omnia
  - bash scripts/install_deepchem_conda.sh deepchem
- source activate deepchem
  - conda activate deepchem
  - pip install yapf==0.22.0
  - pip install coveralls
  - python setup.py install
+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ ENV PATH /miniconda/bin:$PATH
RUN conda update -n base conda && \
    conda create -y --name deepchem python=3.6 && \
    . /miniconda/etc/profile.d/conda.sh && \
    conda init bash && \
    conda activate deepchem && \
    conda install -c deepchem -c rdkit -c conda-forge -c omnia deepchem-gpu==2.3.0 && \
    conda clean -afy
+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ ENV PATH /miniconda/bin:$PATH
RUN conda update -n base conda && \
    git clone https://github.com/deepchem/deepchem.git && \
    cd deepchem && \
    . /miniconda/etc/profile.d/conda.sh && \
    conda init bash && \
    bash scripts/install_deepchem_conda.sh deepchem && \
    conda activate deepchem && \
    python setup.py install && \
+4 −0
Original line number Diff line number Diff line
#!/usr/bin/env bash
# Used to make a conda environment with deepchem

# This line is needed for using conda activate
# This command is nearly equal to `conda init` command
source $(conda info --root)/etc/profile.d/conda.sh

if [ -z "$python_version" ]
then
    echo "Using python 3.6 by default"