From 93f2a92bf02188cb0006eebf081a5886b7f745e7 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 09:07:26 -0400 Subject: [PATCH 01/15] Add bpfin to requirements file. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index a1b2581..d36eb28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Django==1.10.6 psycopg2==2.7 python-decouple==3.0 +git+ssh://git@github.com/Blocp/bpfin.git -- GitLab From b433b498aa29883f8e97daecebf8819e02d7c1f3 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 09:49:06 -0400 Subject: [PATCH 02/15] Install Cython in Dockerfile. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index d8d1b6b..926808f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,8 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt +RUN pip3 install Cython + # Install application requirements. RUN pip3 install -r $CODEROOT/requirements.txt -- GitLab From 835ac0d7835e1652f8c8fdca5f7b5d7b055dbda3 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 09:57:32 -0400 Subject: [PATCH 03/15] Install statsmodel and it's dependencies in Dockerfile. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 926808f..b5d48be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,9 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install Cython +RUN pip3 install numpy==1.11.2 +RUN pip3 install scipy==0.18.1 +RUN pip3 install statsmodels==0.6.1 # Install application requirements. RUN pip3 install -r $CODEROOT/requirements.txt -- GitLab From 033ae4415a6babdfce19711d02783641faaf0380 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 10:10:08 -0400 Subject: [PATCH 04/15] Modify requirements.txt to install bpfin branch for testing. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d36eb28..563005b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Django==1.10.6 psycopg2==2.7 python-decouple==3.0 -git+ssh://git@github.com/Blocp/bpfin.git +git+ssh://git@github.com/Blocp/bpfin.git@modify-requirements -- GitLab From 604ec8fd42de59f7e7200e82bcdb01b8cc38c982 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 10:16:12 -0400 Subject: [PATCH 05/15] Fix Dockerfile. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5d48be..2c425b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,9 +36,9 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install numpy==1.11.2 -RUN pip3 install scipy==0.18.1 -RUN pip3 install statsmodels==0.6.1 +RUN pip3 install numpy==1.11.2 --upgrage +RUN pip3 install scipy==0.18.1 --upgrade +RUN pip3 install statsmodels==0.6.1 --upgrade # Install application requirements. RUN pip3 install -r $CODEROOT/requirements.txt -- GitLab From 06bc43570f46f86f1eae8bb77d5d6b618d8d4a9c Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 10:18:01 -0400 Subject: [PATCH 06/15] Fix Dockerfile. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c425b3..e32284c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,9 +36,9 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install numpy==1.11.2 --upgrage -RUN pip3 install scipy==0.18.1 --upgrade -RUN pip3 install statsmodels==0.6.1 --upgrade +RUN pip3 install --upgrage numpy==1.11.2 +RUN pip3 install --upgrage scipy==0.18.1 +RUN pip3 install --upgrage statsmodels==0.6.1 # Install application requirements. RUN pip3 install -r $CODEROOT/requirements.txt -- GitLab From 0aa75cf198827a9b24a6804c812f3697efe8decf Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 10:20:37 -0400 Subject: [PATCH 07/15] Fix Dockerfile --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e32284c..9210030 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,9 +36,10 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install --upgrage numpy==1.11.2 -RUN pip3 install --upgrage scipy==0.18.1 -RUN pip3 install --upgrage statsmodels==0.6.1 +RUN pip3 install numpy==1.11.2 +RUN pip3 install scipy==0.18.1 +RUN pip3 install wheel +RUN pip3 install statsmodels==0.6.1 # Install application requirements. RUN pip3 install -r $CODEROOT/requirements.txt -- GitLab From a71d719d552f78721baa3949cc696ef78be806f1 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 10:29:21 -0400 Subject: [PATCH 08/15] Fix Dockerfile. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9210030..3199f6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt +RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 RUN pip3 install wheel -- GitLab From a32667a893909854db5e58d93fe7189cb0771ff1 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 11:44:38 -0400 Subject: [PATCH 09/15] Fix docker. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3199f6c..a3d45ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt +RUN pip install git+ssh://git@github.com/Blocp/bpfin.git@modify-requirements RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 -- GitLab From 3f7e33f924adcc0cd993e1ceb23c585812c84a2e Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 11:45:23 -0400 Subject: [PATCH 10/15] Fix docker. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3d45ab..421a9ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip install git+ssh://git@github.com/Blocp/bpfin.git@modify-requirements +RUN pip3 install git+ssh://git@github.com/Blocp/bpfin.git@modify-requirements RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 -- GitLab From f36eedcacb74351cd1d6d2afdd524a649a292383 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 11:46:57 -0400 Subject: [PATCH 11/15] Fix Dockerfile and requirements. --- Dockerfile | 1 - requirements.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 421a9ff..3199f6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,6 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install git+ssh://git@github.com/Blocp/bpfin.git@modify-requirements RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 diff --git a/requirements.txt b/requirements.txt index 563005b..d36eb28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Django==1.10.6 psycopg2==2.7 python-decouple==3.0 -git+ssh://git@github.com/Blocp/bpfin.git@modify-requirements +git+ssh://git@github.com/Blocp/bpfin.git -- GitLab From d645811de3e57dadf9b1e96fcc4f210197275b69 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 11:53:56 -0400 Subject: [PATCH 12/15] Remove unwanted packages. --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3199f6c..11e6f37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,11 +36,9 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 RUN pip3 install wheel -RUN pip3 install statsmodels==0.6.1 # Install application requirements. RUN pip3 install -r $CODEROOT/requirements.txt -- GitLab From a5e2eb54bf89247dda1d68960b0674ad881a9eca Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 12:00:49 -0400 Subject: [PATCH 13/15] Add matplotlib for now. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 11e6f37..81ac6e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt +RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 RUN pip3 install wheel -- GitLab From 33eb600c37865c60ce061f78df7240359c55e80e Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 13:05:50 -0400 Subject: [PATCH 14/15] Update requirements. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d36eb28..1724cc7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Django==1.10.6 psycopg2==2.7 python-decouple==3.0 -git+ssh://git@github.com/Blocp/bpfin.git +git+ssh://git@github.com/Blocp/bpfin.git@remove-matplotlib-import -- GitLab From cba3325d37264eea5be0041fd96677f648825590 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Tue, 25 Apr 2017 13:19:42 -0400 Subject: [PATCH 15/15] Remove unused dependencies. --- Dockerfile | 1 - requirements.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81ac6e5..11e6f37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,6 @@ RUN rm -rf /var/lib/apt/lists/* COPY ./requirements.txt $CODEROOT/requirements.txt -RUN pip3 install matplotlib==2.0.0 RUN pip3 install numpy==1.11.2 RUN pip3 install scipy==0.18.1 RUN pip3 install wheel diff --git a/requirements.txt b/requirements.txt index 1724cc7..d36eb28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Django==1.10.6 psycopg2==2.7 python-decouple==3.0 -git+ssh://git@github.com/Blocp/bpfin.git@remove-matplotlib-import +git+ssh://git@github.com/Blocp/bpfin.git -- GitLab