From 1d94ac1c9fbbc1825d6a8400f4c7c9671a21fbec Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:36:49 +0530 Subject: [PATCH 01/26] 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 e30aebf644987857e22903e8c7aeda69eabd723f Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:49:00 +0530 Subject: [PATCH 02/26] Update make_bar_graph.py --- make_bar_graph.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/make_bar_graph.py b/make_bar_graph.py index d87fa21..bab900e 100644 --- a/make_bar_graph.py +++ b/make_bar_graph.py @@ -3,9 +3,6 @@ import numpy as np import altair as alt import json -alt.data_transformers.enable('data_server_proxied') - - # npm install vega-lite vega-cli canvas @@ -16,7 +13,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 beeafed53e6ee6204c09609219ac84781d9b9948 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:51:31 +0530 Subject: [PATCH 03/26] Update make_bar_graph.py --- 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 bab900e..484c2c6 100644 --- a/make_bar_graph.py +++ b/make_bar_graph.py @@ -2,7 +2,7 @@ import pandas as pd import numpy as np import altair as alt import json - +import os # npm install vega-lite vega-cli canvas From fce030a7e2b6d4df8bf7992bc4b63269e6910991 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:58:04 +0530 Subject: [PATCH 04/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"] From 1890da31db532aa66e905b175124166cb51cba3b Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:01:06 +0530 Subject: [PATCH 05/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0b687be..84ee990 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 sudo npm install -g vega-lite vega-cli canvas ENTRYPOINT ["python", "/main.py"] From fca5e99a652d1dff1dd78c58120facc2b9584513 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:09:51 +0530 Subject: [PATCH 06/26] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84ee990..4eb317a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:latest +FROM python:latest # Install dependencies. ADD requirements.txt /requirements.txt @@ -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 sudo npm install -g vega-lite vega-cli canvas - +RUN pip install selenium +RUN apt-get install chromium-chromedriver ENTRYPOINT ["python", "/main.py"] From 9ca1c7a59530e7a9d6212624e9a39f6a4ee8c949 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:20:20 +0530 Subject: [PATCH 07/26] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4eb317a..d5c5fe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,4 @@ ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json RUN pip install -r requirements.txt RUN pip install selenium -RUN apt-get install chromium-chromedriver ENTRYPOINT ["python", "/main.py"] From 331e0590c668e6f1706cf78577ff3644454654a1 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:45:38 +0530 Subject: [PATCH 08/26] Update Dockerfile --- Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5c5fe0..241868b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:latest +FROM ubuntu:latest # Install dependencies. ADD requirements.txt /requirements.txt @@ -6,6 +6,13 @@ ADD main.py /main.py 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 pip install selenium + +RUN apt-get update \ + && apt-get install -y python3-pip python3-dev \ + && cd /usr/local/bin \ + && ln -s /usr/bin/python3 python \ + && pip3 install --upgrade pip +RUN sudo apt-get install chromium-chromedriver +RUN pip3 install -r requirements.txt +RUN pip3 install selenium ENTRYPOINT ["python", "/main.py"] From cdce7b206aad3333a2d0f376f800642e42aeb6fd Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:48:45 +0530 Subject: [PATCH 09/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 241868b..4cac47b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && cd /usr/local/bin \ && ln -s /usr/bin/python3 python \ && pip3 install --upgrade pip -RUN sudo apt-get install chromium-chromedriver +RUN apt-get install chromium-chromedriver RUN pip3 install -r requirements.txt RUN pip3 install selenium ENTRYPOINT ["python", "/main.py"] From 5212db455c33d1f7239c134abe7acc5cc2748205 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:51:19 +0530 Subject: [PATCH 10/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4cac47b..9a24077 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && cd /usr/local/bin \ && ln -s /usr/bin/python3 python \ && pip3 install --upgrade pip -RUN apt-get install chromium-chromedriver +RUN apt-get install -y chromium-chromedriver RUN pip3 install -r requirements.txt RUN pip3 install selenium ENTRYPOINT ["python", "/main.py"] From a2498a45102722adbefb33e4f8902b5163aea190 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:55:28 +0530 Subject: [PATCH 11/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a24077..092270b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && cd /usr/local/bin \ && ln -s /usr/bin/python3 python \ && pip3 install --upgrade pip -RUN apt-get install -y chromium-chromedriver +RUN y | apt-get install chromium-chromedriver RUN pip3 install -r requirements.txt RUN pip3 install selenium ENTRYPOINT ["python", "/main.py"] From 4e28ee42070dc67e79ceefb8d73121ae105c8b5d Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 02:01:17 +0530 Subject: [PATCH 12/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 092270b..8d4ef71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && cd /usr/local/bin \ && ln -s /usr/bin/python3 python \ && pip3 install --upgrade pip -RUN y | apt-get install chromium-chromedriver +RUN apt-get -y install chromium-chromedriver RUN pip3 install -r requirements.txt RUN pip3 install selenium ENTRYPOINT ["python", "/main.py"] From 42e11602f6ae4b557894cffd7fd9ddd05d3f3828 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 02:04:55 +0530 Subject: [PATCH 13/26] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8d4ef71..b2670ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:latest +ARG DEBIAN_FRONTEND=noninteractive + # Install dependencies. ADD requirements.txt /requirements.txt ADD main.py /main.py From b70a14c7ce5f1f93aff9cd1ad61851dced427c37 Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Wed, 29 Jul 2020 11:39:38 +0530 Subject: [PATCH 14/26] some changes --- Dockerfile | 2 +- main.py | 31 +++++++++++++++++-------------- package-lock.json | 39 --------------------------------------- 3 files changed, 18 insertions(+), 54 deletions(-) diff --git a/Dockerfile b/Dockerfile index b2670ee..61c28b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ADD main.py /main.py ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json - +RUN apt-get update && apt-get -y install google-chrome-stable RUN apt-get update \ && apt-get install -y python3-pip python3-dev \ && cd /usr/local/bin \ diff --git a/main.py b/main.py index 396c509..dc6f26e 100644 --- a/main.py +++ b/main.py @@ -21,19 +21,19 @@ START_COMMENT = '' END_COMMENT = '' listReg = f"{START_COMMENT}[\\s\\S]+{END_COMMENT}" -user = os.getenv('INPUT_USERNAME') -waka_key = os.getenv('INPUT_WAKATIME_API_KEY') -ghtoken = os.getenv('INPUT_GH_TOKEN') -showTimeZone = os.getenv('INPUT_SHOW_TIMEZONE') -showProjects = os.getenv('INPUT_SHOW_PROJECTS') -showEditors = os.getenv('INPUT_SHOW_EDITORS') -showOs = os.getenv('INPUT_SHOW_OS') -showCommit = os.getenv('INPUT_SHOW_COMMIT') -showLanguage = os.getenv('INPUT_SHOW_LANGUAGE') -show_loc = os.getenv('INPUT_SHOW_LINES_OF_CODE') +user = 'y' if os.getenv('INPUT_USERNAME') is None else os.getenv('INPUT_USERNAME') +waka_key = 'y' if os.getenv('INPUT_WAKATIME_API_KEY') is None else os.getenv('INPUT_WAKATIME_API_KEY') +ghtoken = 'y' if os.getenv('INPUT_GH_TOKEN') is None else os.getenv('INPUT_GH_TOKEN') +showTimeZone = 'y' if os.getenv('INPUT_SHOW_TIMEZONE') is None else os.getenv('INPUT_SHOW_TIMEZONE') +showProjects = 'y' if os.getenv('INPUT_SHOW_PROJECTS') is None else os.getenv('INPUT_SHOW_PROJECTS') +showEditors = 'y' if os.getenv('INPUT_SHOW_EDITORS') is None else os.getenv('INPUT_SHOW_EDITORS') +showOs = 'y' if os.getenv('INPUT_SHOW_OS') is None else os.getenv('INPUT_SHOW_OS') +showCommit = 'y' if os.getenv('INPUT_SHOW_COMMIT') is None else os.getenv('INPUT_SHOW_COMMIT') +showLanguage = 'y' if os.getenv('INPUT_SHOW_LANGUAGE') is None else os.getenv('INPUT_SHOW_LANGUAGE') +show_loc = 'y' if os.getenv('INPUT_SHOW_LINES_OF_CODE') is None else os.getenv('INPUT_SHOW_LINES_OF_CODE') -showLanguagePerRepo = os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') -showLocChart = os.getenv('INPUT_SHOW_LOC_CHART') +showLanguagePerRepo = 'y' if os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') is None else os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') +showLocChart = 'y' if os.getenv('INPUT_SHOW_LOC_CHART') is None else os.getenv('INPUT_SHOW_LOC_CHART') show_waka_stats = 'y' # The GraphQL query to get commit data. userInfoQuery = """ @@ -371,6 +371,11 @@ def get_stats(): stats = '' repositoryList = run_query(repositoryListQuery.substitute(username=username, id=id)) + + if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']: + stats = stats + get_waka_time_stats() + + if showLanguagePerRepo.lower() in ['true', '1', 't', 'y', 'yes']: stats = stats + generate_language_per_repo(repositoryList) + '\n\n' @@ -381,8 +386,6 @@ def get_stats(): stats = stats + '![Chart not found](https://github.com/prabhatdev/prabhatdev/blob/master/charts/bar_graph.png) \n\n' # stats = stats + generate_language_per_repo(repositoryList) + '\n\n' - if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']: - stats = stats + get_waka_time_stats() return stats diff --git a/package-lock.json b/package-lock.json index efbfdc9..25101e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,16 +74,6 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, - "canvas": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz", - "integrity": "sha512-S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==", - "requires": { - "nan": "^2.14.0", - "node-pre-gyp": "^0.11.0", - "simple-get": "^3.0.3" - } - }, "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -899,16 +889,6 @@ "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.2.tgz", "integrity": "sha512-39h8/fZp4kDwSeDGIEoyEiIgtP3mgY3D08InD1Ldm0FntePpSe1tXzC1zcvoLe/+f7Qprl6Jfwux/ksOXvpj2w==" }, - "vega-cli": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/vega-cli/-/vega-cli-5.13.0.tgz", - "integrity": "sha512-5gfN6JmZ4HqNr8gYdu2g+Nkh9MAcsUHJ6Bp1y67vxn9bs8LEWNk1t8vCGlt3BH2CjlyI7jLaF4NRw8bb2IhH8g==", - "requires": { - "canvas": "^2.6.1", - "vega": "5.13.0", - "yargs": "15" - } - }, "vega-crossfilter": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.2.tgz", @@ -1019,25 +999,6 @@ "vega-util": "^1.13.2" } }, - "vega-lite": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.14.0.tgz", - "integrity": "sha512-zWwmH3iX/U8xj4RsmpLkLFSVimNh3r/crbOk72MyolsB0v0TB3lRbsf1r5eJCdVPPSVEkE5TXwDYE+ygQ2kgbQ==", - "requires": { - "@types/clone": "~0.1.30", - "@types/fast-json-stable-stringify": "^2.0.0", - "array-flat-polyfill": "^1.0.1", - "clone": "~2.1.2", - "fast-deep-equal": "~3.1.3", - "fast-json-stable-stringify": "~2.1.0", - "json-stringify-pretty-compact": "~2.0.0", - "tslib": "~2.0.0", - "vega-event-selector": "~2.0.3", - "vega-expression": "~2.6.5", - "vega-util": "~1.14.1", - "yargs": "~15.4.1" - } - }, "vega-loader": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.0.tgz", From 7458f650e8a4c38a0d70c10240a4b4f076413b69 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:43:17 +0530 Subject: [PATCH 15/26] Update Dockerfile --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 61c28b6..3d50b18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,13 @@ ADD main.py /main.py ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json -RUN apt-get update && apt-get -y install google-chrome-stable + +RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - +RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list' +RUN apt-get -y update +RUN apt-get install -y google-chrome-stable + + RUN apt-get update \ && apt-get install -y python3-pip python3-dev \ && cd /usr/local/bin \ From dfefae8aecacd44d707074320e309f22c6d02a87 Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:45:04 +0530 Subject: [PATCH 16/26] Update Dockerfile --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d50b18..5ce65ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,8 @@ ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - -RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list' -RUN apt-get -y update -RUN apt-get install -y google-chrome-stable - +RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb +RUN sudo apt install ./google-chrome-stable_current_amd64.deb RUN apt-get update \ && apt-get install -y python3-pip python3-dev \ From f63f7c6c98f539fb6c86265143349843cb1c875b Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:47:02 +0530 Subject: [PATCH 17/26] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5ce65ae..deceda6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,8 @@ ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json +RUN sudo apt-get -y install wget + RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb RUN sudo apt install ./google-chrome-stable_current_amd64.deb From 98634529f6a928ccad14d6b2404aaf45462b534a Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:47:52 +0530 Subject: [PATCH 18/26] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index deceda6..c6334c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,10 @@ ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json -RUN sudo apt-get -y install wget +RUN apt-get -y install wget RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -RUN sudo apt install ./google-chrome-stable_current_amd64.deb +RUN apt install ./google-chrome-stable_current_amd64.deb RUN apt-get update \ && apt-get install -y python3-pip python3-dev \ From cc558825d2f320e5e054a699b061f1a50350b4fe Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:49:28 +0530 Subject: [PATCH 19/26] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6334c9..9b64ec7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,13 +9,14 @@ ADD loc.py /loc.py ADD make_bar_graph.py /make_bar_graph.py ADD colors.json /colors.json +RUN apt-get update + RUN apt-get -y install wget RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb RUN apt install ./google-chrome-stable_current_amd64.deb -RUN apt-get update \ - && apt-get install -y python3-pip python3-dev \ +RUN apt-get install -y python3-pip python3-dev \ && cd /usr/local/bin \ && ln -s /usr/bin/python3 python \ && pip3 install --upgrade pip From f097e6c2cab11d753e73525df3494a7761a157dc Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:51:24 +0530 Subject: [PATCH 20/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b64ec7..a8863cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update RUN apt-get -y install wget RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -RUN apt install ./google-chrome-stable_current_amd64.deb +RUN apt install -y ./google-chrome-stable_current_amd64.deb RUN apt-get install -y python3-pip python3-dev \ && cd /usr/local/bin \ From 621b75073ba3413b9cdbd8c555f966d83de06c1c Mon Sep 17 00:00:00 2001 From: prabhatdev <38984210+prabhatdev@users.noreply.github.com> Date: Wed, 29 Jul 2020 11:54:00 +0530 Subject: [PATCH 21/26] Update Dockerfile --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8863cc..8047e2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,11 @@ ADD colors.json /colors.json RUN apt-get update -RUN apt-get -y install wget +RUN apt-get install -y google-chrome-stable +# RUN apt-get -y install wget -RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -RUN apt install -y ./google-chrome-stable_current_amd64.deb +# RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb +# RUN apt install -y ./google-chrome-stable_current_amd64.deb RUN apt-get install -y python3-pip python3-dev \ && cd /usr/local/bin \ From 52c50a66c39a095c1b734ce28ce5934c396c576a Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Wed, 29 Jul 2020 12:21:26 +0530 Subject: [PATCH 22/26] docker file removed --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f64f22c..89af850 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.png node_modules/ __pycache__/ - +Dockerfile From a332ea19fcf0751ed3a2dd6a7d4a185c2cbe8cd7 Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Wed, 29 Jul 2020 12:24:33 +0530 Subject: [PATCH 23/26] docker file removed --- Dockerfile | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8047e2b..0000000 --- a/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM ubuntu:latest - -ARG DEBIAN_FRONTEND=noninteractive - -# Install dependencies. -ADD requirements.txt /requirements.txt -ADD main.py /main.py -ADD loc.py /loc.py -ADD make_bar_graph.py /make_bar_graph.py -ADD colors.json /colors.json - -RUN apt-get update - -RUN apt-get install -y google-chrome-stable -# RUN apt-get -y install wget - -# RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -# RUN apt install -y ./google-chrome-stable_current_amd64.deb - -RUN apt-get install -y python3-pip python3-dev \ - && cd /usr/local/bin \ - && ln -s /usr/bin/python3 python \ - && pip3 install --upgrade pip -RUN apt-get -y install chromium-chromedriver -RUN pip3 install -r requirements.txt -RUN pip3 install selenium -ENTRYPOINT ["python", "/main.py"] From d38ce546b220abcadaefbebd3e8fac81c918ebbc Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Fri, 31 Jul 2020 09:57:37 +0530 Subject: [PATCH 24/26] updated docker file --- .gitignore | 2 +- Dockerfile | 12 ++++++++++++ main.py | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Dockerfile diff --git a/.gitignore b/.gitignore index 89af850..f64f22c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.png node_modules/ __pycache__/ -Dockerfile + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..2e72594 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM nikolaik/python-nodejs:latest + +# Install dependencies. +ADD requirements.txt /requirements.txt +ADD main.py /main.py +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 + +ENTRYPOINT ["python", "/main.py"] \ No newline at end of file diff --git a/main.py b/main.py index dc6f26e..be827f9 100644 --- a/main.py +++ b/main.py @@ -93,7 +93,7 @@ def run_v3_api(query): repositoryListQuery = Template(""" { user(login: "$username") { - repositories(orderBy: {field: CREATED_AT, direction: ASC}, last: 5, affiliations: [OWNER, COLLABORATOR, ORGANIZATION_MEMBER], isFork: false) { + repositories(orderBy: {field: CREATED_AT, direction: ASC}, last: 100, affiliations: [OWNER, COLLABORATOR, ORGANIZATION_MEMBER], isFork: false) { totalCount edges { node { @@ -374,7 +374,7 @@ def get_stats(): if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']: stats = stats + get_waka_time_stats() - + if showLanguagePerRepo.lower() in ['true', '1', 't', 'y', 'yes']: stats = stats + generate_language_per_repo(repositoryList) + '\n\n' From f1daa047af114640fccdba1e4fc223ced17332b3 Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Fri, 31 Jul 2020 10:28:53 +0530 Subject: [PATCH 25/26] docker working --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2e72594..e48d613 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,11 @@ 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 + +ENV NPM_CONFIG_PREFIX=/home/node/.npm-global + +RUN npm -g config set user root + +RUN npm install -g vega-lite vega-cli canvas ENTRYPOINT ["python", "/main.py"] \ No newline at end of file From 5af4b3a8e20232a1df20ea97ebcd1372f15a7b81 Mon Sep 17 00:00:00 2001 From: prabhatdev Date: Fri, 31 Jul 2020 12:34:47 +0530 Subject: [PATCH 26/26] prints removed --- loc.py | 30 ++++-------------------------- main.py | 6 +++--- make_bar_graph.py | 7 ++----- 3 files changed, 9 insertions(+), 34 deletions(-) diff --git a/loc.py b/loc.py index a92da4b..d9bf064 100644 --- a/loc.py +++ b/loc.py @@ -30,9 +30,9 @@ class LinesOfCode: print(repo) self.getCommitStat(repo['node'], yearly_data) time.sleep(0.7) - print("\n\n") - print(yearly_data) - print("here") + # print("\n\n") + # print(yearly_data) + # print("here") graph = BarGraph(yearly_data) graph_file = graph.build_graph() self.pushChart() @@ -89,28 +89,6 @@ class LinesOfCode: repo.update_file(contents.path, "Charts Added", data, contents.sha) except Exception as e: repo.create_file("charts/bar_graph.png", "Initial Commit", data) - print("pushed") + # print("pushed") -# if __name__ == '__main__': -# try: -# g = Github(ghtoken) -# headers = {"Authorization": "Bearer " + ghtoken} -# user_data = run_query(userInfoQuery) # Execute the query -# username = user_data["data"]["viewer"]["login"] -# id = user_data["data"]["viewer"]["id"] -# print("user {} id {}".format(username, id)) -# getLoc() - -# # repo = g.get_repo(f"{username}/{username}") -# # contents = repo.get_readme() -# # waka_stats = get_stats() -# # rdmd = decode_readme(contents.content) -# # new_readme = generate_new_readme(stats=waka_stats, readme=rdmd) -# # print(new_readme) -# # # if new_readme != rdmd: -# # repo.update_file(path=contents.path, message='Updated with Dev Metrics', -# # content=new_readme, sha=contents.sha, branch='master') -# # print("Readme updated") -# except Exception as e: -# print("Exception Occurred" + str(e)) diff --git a/main.py b/main.py index be827f9..b3653b4 100644 --- a/main.py +++ b/main.py @@ -176,7 +176,7 @@ def generate_commit_list(tz): result = run_query(userInfoQuery) # Execute the query username = result["data"]["viewer"]["login"] id = result["data"]["viewer"]["id"] - print("user {}".format(username)) + # print("user {}".format(username)) result = run_query(createContributedRepoQuery.substitute(username=username)) nodes = result["data"]["user"]["repositoriesContributedTo"]["nodes"] @@ -411,13 +411,13 @@ if __name__ == '__main__': user_data = run_query(userInfoQuery) # Execute the query username = user_data["data"]["viewer"]["login"] id = user_data["data"]["viewer"]["id"] - print("user {} id {}".format(username, id)) + # print("user {} id {}".format(username, id)) repo = g.get_repo(f"{username}/{username}") contents = repo.get_readme() waka_stats = get_stats() rdmd = decode_readme(contents.content) new_readme = generate_new_readme(stats=waka_stats, readme=rdmd) - print(new_readme) + # print(new_readme) if new_readme != rdmd: repo.update_file(path=contents.path, message='Updated with Dev Metrics', content=new_readme, sha=contents.sha, branch='master') diff --git a/make_bar_graph.py b/make_bar_graph.py index 484c2c6..6c66c6e 100644 --- a/make_bar_graph.py +++ b/make_bar_graph.py @@ -34,8 +34,7 @@ class BarGraph: top_languages[language] = 1 top_languages[language] += 1 - print("here") - print(self.yearly_data) + # print(self.yearly_data) all_languages = list(top_languages.keys()) @@ -57,8 +56,7 @@ class BarGraph: language_year.append(language_quarter) languages_all_loc[language] = language_year - print("here 2") - print(languages_all_loc) + # print(languages_all_loc) language_df = {} @@ -77,7 +75,6 @@ class BarGraph: df = pd.concat(list(language_df.values())) - # print(df) chart = alt.Chart(df).mark_bar().encode(