release/1.0.0: Remove unused args from build

nok · Feb 28, 2021 · 52836e6 · 52836e6
1 parent 81844a2
commit 52836e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,9  44,6 @@ before_install:
   - travis_wait 30 docker build
     -t sklearn-porter
     --build-arg PYTHON_VER=${PYTHON_VER}
-    --build-arg CYTHON_VER=${CYTHON_VER}
-    --build-arg NUMPY_VER=${NUMPY_VER}
-    --build-arg SCIPY_VER=${SCIPY_VER}
     --build-arg SKLEARN_VER=${SKLEARN_VER} .
   - docker run
     --detach
@@ -66,16  63,10 @@ script:
 
 after_success:
   - test ${PYTHON_VER} = "python=3.7" &&
-    test ${CYTHON_VER} = "cython" &&
-    test ${NUMPY_VER} = "numpy" &&
-    test ${SCIPY_VER} = "scipy" &&
-    test ${SKLEARN_VER} = "scikit-learn==0.21" &&
     test ${SKLEARN_VER} = "scikit-learn~=0.21.0" &&
       docker exec -it test ./docker-entrypoint.sh
         codecov
           --token ${CODECOV_TOKEN}
           --name "${TRAVIS_COMMIT}"
           --env ${PYTHON_VER}
-                ${CYTHON_VER}
-                ${NUMPY_VER}
-                ${SCIPY_VER}
-                ${SKLEARN_VER}
                 ${SKLEARN_VER}
diff --git a/Dockerfile b/Dockerfile
@@ -38,18  38,13 @@ COPY . ${HOME}/repo
 WORKDIR ${HOME}/repo
 
 ARG PYTHON_VER
-ARG CYTHON_VER
-ARG NUMPY_VER
-ARG SCIPY_VER
 ARG SKLEARN_VER
 
 RUN conda config --set auto_activate_base true && \
     conda install -y -n base ${PYTHON_VER:-python=3.6} && \
     conda run -n base python -m pip install --no-cache-dir -U pip && \
     conda run -n base --no-capture-output python -m pip install --no-cache-dir \
-        ${CYTHON_VER:-cython} \
-        ${NUMPY_VER:-numpy} \
-        ${SCIPY_VER:-scipy} \
         cython numpy scipy \
         ${SKLEARN_VER:-scikit-learn} && \
     conda run -n base --no-capture-output python -m pip install --no-cache-dir -e ".[development,examples]" && \
     conda clean --all -y && \