From 166ff4fb9834ff3c8398bb5e2216cf20e2f94b2d Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:34:33 +0530 Subject: [PATCH 1/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43c63c5..f93759c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,4 @@ ADD colors.json /colors.json RUN pip install -r requirements.txt RUN npm install vega-lite vega-cli canvas -CMD ["python", "/main.py"] \ No newline at end of file +ENTRYPOINT ["python", "/main.py"] From 481575905a2b2e3dd6a6dbc724181106da42a23a Mon Sep 17 00:00:00 2001 From: Anmol Date: Thu, 30 Jul 2020 18:23:00 +0530 Subject: [PATCH 2/7] FEAT: NEW GRAPH MODULE --- make_bar_graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_bar_graph.py b/make_bar_graph.py index d87fa21..a2b16ee 100644 --- a/make_bar_graph.py +++ b/make_bar_graph.py @@ -16,7 +16,7 @@ class BarGraph: def build_graph(self): - with open('colors.json') as f: + with open('./colors.json') as f: colors = json.load(f) allColorsValues = [] From 1e72130586dfea2d6b3e92a1e6e727f467df2217 Mon Sep 17 00:00:00 2001 From: Anmol Date: Thu, 30 Jul 2020 18:31:09 +0530 Subject: [PATCH 3/7] FEAT: NEW GRAPH MODULE --- make_bar_graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_bar_graph.py b/make_bar_graph.py index a2b16ee..9f4cf0f 100644 --- a/make_bar_graph.py +++ b/make_bar_graph.py @@ -16,7 +16,7 @@ class BarGraph: def build_graph(self): - with open('./colors.json') as f: + with open(os.path.join(os.path.dirname(__file__), 'colors.json')) as f: colors = json.load(f) allColorsValues = [] From 5b3a6dcda72dcbcbd24ff88e00261c90e375bdae Mon Sep 17 00:00:00 2001 From: Anmol Date: Thu, 30 Jul 2020 18:34:38 +0530 Subject: [PATCH 4/7] FEAT: NEW GRAPH MODULE --- make_bar_graph.py | 1 + 1 file changed, 1 insertion(+) diff --git a/make_bar_graph.py b/make_bar_graph.py index 9f4cf0f..822ee0b 100644 --- a/make_bar_graph.py +++ b/make_bar_graph.py @@ -1,3 +1,4 @@ +import os import pandas as pd import numpy as np import altair as alt From 100a99502eafb12ad944b9f73bb9d649cc00a8ca Mon Sep 17 00:00:00 2001 From: Anmol Date: Thu, 30 Jul 2020 19:47:28 +0530 Subject: [PATCH 5/7] FEAT: NEW GRAPH MODULE --- requirements.txt | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e0d33b7..9559adc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,19 @@ -altair==4.1.0 +altair @ git+git://github.com/altair-viz/altair.git@2ef75f731ab9e805670db973b9f1c93347c20cc0 altair-data-server==0.4.1 altair-saver==0.5.0 altair-viewer==0.3.0 +appdirs==1.4.3 attrs==19.3.0 +bcrypt==3.1.7 certifi==2020.6.20 +cffi==1.14.0 chardet==3.0.4 +cryptography==2.9.2 cycler==0.10.0 Deprecated==1.2.10 +distlib==0.3.0 entrypoints==0.3 +filelock==3.0.12 gitdb==4.0.5 GitPython==3.1.7 idna==2.10 @@ -17,17 +23,30 @@ kiwisolver==1.2.0 lizard==1.17.4 MarkupSafe==1.1.1 matplotlib==3.3.0 +MouseInfo==0.1.2 numpy==1.19.1 +opencv-python==4.2.0.34 pandas==1.0.5 +paramiko==2.7.1 Pillow==7.2.0 +pipenv==2018.11.26 portpicker==1.3.1 +PyAutoGUI==0.9.48 +pycparser==2.20 PyDriller==1.15.2 +PyGetWindow==0.0.8 PyGithub==1.51 PyJWT==1.7.1 +PyMsgBox==1.0.7 +PyNaCl==1.3.0 pyparsing==2.4.7 +pyperclip==1.7.0 +PyRect==0.1.4 pyrsistent==0.16.0 +PyScreeze==0.1.25 python-dateutil==2.8.1 python-dotenv==0.14.0 +PyTweening==1.0.3 pytz==2020.1 requests==2.24.0 selenium==3.141.0 @@ -36,4 +55,8 @@ smmap==3.0.4 toolz==0.10.0 tornado==6.0.4 urllib3==1.25.9 +virtualenv==20.0.18 +virtualenv-clone==0.5.4 wrapt==1.12.1 +xlrd==1.2.0 +XlsxWriter==1.2.8 From 42f0f475880368212e57eb0911b064ec6c2ff1f9 Mon Sep 17 00:00:00 2001 From: Anmol Date: Thu, 30 Jul 2020 19:52:14 +0530 Subject: [PATCH 6/7] FEAT: NEW GRAPH MODULE --- Dockerfile | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f93759c..0b687be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,6 @@ ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json RUN pip install -r requirements.txt -RUN npm install vega-lite vega-cli canvas +RUN npm install -g vega-lite vega-cli canvas ENTRYPOINT ["python", "/main.py"] diff --git a/requirements.txt b/requirements.txt index 9559adc..4c68612 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -altair @ git+git://github.com/altair-viz/altair.git@2ef75f731ab9e805670db973b9f1c93347c20cc0 +altair==4.1.0 altair-data-server==0.4.1 altair-saver==0.5.0 altair-viewer==0.3.0 From 2e8255529b4b017df50ad0226d44d321028d0775 Mon Sep 17 00:00:00 2001 From: Anmol Date: Thu, 30 Jul 2020 19:58:37 +0530 Subject: [PATCH 7/7] FEAT: NEW GRAPH MODULE --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0b687be..f93759c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,6 @@ ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json RUN pip install -r requirements.txt -RUN npm install -g vega-lite vega-cli canvas +RUN npm install vega-lite vega-cli canvas ENTRYPOINT ["python", "/main.py"]