From d7ed695ad11c551695237205fc38e9c2835b455f Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Sun, 20 Feb 2022 23:16:02 +0000 Subject: [PATCH] fixed build script, added binutils to docker container for build requirements, added required scipy modules to superscript.spec Former-commit-id: 60a6fc1106dc90514bd1270138ab9166efa29290 --- .devcontainer/Dockerfile | 2 +- build/build-CLI.bat | 2 +- build/build-CLI.sh | 2 +- src/superscript.spec | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f762d03..9992aaa 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ FROM python:slim WORKDIR / RUN apt-get -y update; apt-get -y upgrade -RUN apt-get -y install git +RUN apt-get -y install git binutils COPY requirements.txt . RUN pip install -r requirements.txt \ No newline at end of file diff --git a/build/build-CLI.bat b/build/build-CLI.bat index 29199e2..d5be7f8 100644 --- a/build/build-CLI.bat +++ b/build/build-CLI.bat @@ -1,4 +1,4 @@ -set pathtospec="../src/cli/superscript.spec" +set pathtospec="../src/superscript.spec" set pathtodist="../dist/" set pathtowork="temp/" diff --git a/build/build-CLI.sh b/build/build-CLI.sh index e328718..82f275e 100644 --- a/build/build-CLI.sh +++ b/build/build-CLI.sh @@ -1,4 +1,4 @@ -pathtospec="../src/cli/superscript.spec" +pathtospec="../src/superscript.spec" pathtodist="../dist/" pathtowork="temp/" diff --git a/src/superscript.spec b/src/superscript.spec index 5d09620..fdde061 100644 --- a/src/superscript.spec +++ b/src/superscript.spec @@ -9,13 +9,15 @@ a = Analysis(['superscript.py'], hiddenimports=[ "dnspython", "sklearn.utils._weight_vector", + "sklearn.utils._typedefs", + "sklearn.neighbors._partition_nodes", "requests", ], hookspath=[], runtime_hooks=[], excludes=[ "matplotlib", - "pandas" + #"pandas" ], win_no_prefer_redirects=False, win_private_assemblies=False,