From b29120807753cb08e5579c3b8f231291edb68afe Mon Sep 17 00:00:00 2001 From: avichai kaykov <81909274+avichaip@users.noreply.github.com> Date: Sun, 19 Jun 2022 15:27:44 +0300 Subject: [PATCH 01/13] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2834515..0ed2f1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ pylint == 2.4.3 pytest == 5.2.2 pytest-html == 2.0.0 flask == 1.0.0 - +test_hello_world.py From cdeea8ff2b9c7fcb6cac9388f942f2b86b3facbf Mon Sep 17 00:00:00 2001 From: avichai kaykov <81909274+avichaip@users.noreply.github.com> Date: Sun, 19 Jun 2022 15:30:12 +0300 Subject: [PATCH 02/13] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0ed2f1a..7d0a62f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,3 @@ pylint == 2.4.3 pytest == 5.2.2 pytest-html == 2.0.0 flask == 1.0.0 -test_hello_world.py From 6709f2aca204ddf3d5cb7e85747b41b5db2f992d Mon Sep 17 00:00:00 2001 From: avichai kaykov <81909274+avichaip@users.noreply.github.com> Date: Sun, 19 Jun 2022 16:04:43 +0300 Subject: [PATCH 03/13] version 2 --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0125257..6a0a532 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: run_tests: docker: - - image: circleci/python:3.7.4 + - image: circleci/python:3.8.4 steps: - checkout - run: @@ -13,11 +13,11 @@ jobs: - run: name: Run unit tests command: | - pytest --junitxml=test-reports/junit.xml --html=test-reports/pytest_report.html --self-contained-html - - store_test_results: - path: test-reports - - store_artifacts: - path: test-reports + + from jinja2.utils import markupsafe + + markupsafe.Markup() + Markup('') workflows: build_test: jobs: From 181b39fbf7683b64b9c4e14b05f67ad5e1a7b3e6 Mon Sep 17 00:00:00 2001 From: avichai kaykov <81909274+avichaip@users.noreply.github.com> Date: Sun, 19 Jun 2022 16:34:21 +0300 Subject: [PATCH 04/13] 2yes --- .circleci/config.yml | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6a0a532..8eb22ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,7 @@ version: 2.1 + jobs: - run_tests: + build: docker: - image: circleci/python:3.8.4 steps: @@ -13,13 +14,33 @@ jobs: - run: name: Run unit tests command: | - - from jinja2.utils import markupsafe - markupsafe.Markup() - Markup('') + build2: + docker: + - image: circleci/python:3.8.4 + steps: + - checkout + - run: + name: Install Python dependencies + command: | + echo 'export PATH=~$PATH:~/.local/bin' >> $BASH_ENV && source $BASH_ENV + pip install --user -r requirements.txt + - run: + name: Run unit tests + command: | workflows: build_test: jobs: - run_tests + +workflows: + version: 2 + + my_workflow: + jobs: + -build + -build2: + requires: + -build + From 968d66c19366a507fa60e0285115a7780680081a Mon Sep 17 00:00:00 2001 From: avichai kaykov <81909274+avichaip@users.noreply.github.com> Date: Mon, 20 Jun 2022 09:56:51 +0300 Subject: [PATCH 05/13] Create Dockerfile --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5e4023e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM python:3.8-alpine + +COPY ./requirements.txt . + +RUN pip install --user -r requirements.txt + +CMD ["python3","server.py"] From 7e89349e8284b64a8854fddea8f1b216c60c0ce5 Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 12:08:37 +0300 Subject: [PATCH 06/13] test1 --- .circleci/config.yml | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8eb22ef..7448e38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,32 +15,32 @@ jobs: name: Run unit tests command: | - build2: - docker: - - image: circleci/python:3.8.4 - steps: - - checkout - - run: - name: Install Python dependencies - command: | - echo 'export PATH=~$PATH:~/.local/bin' >> $BASH_ENV && source $BASH_ENV - pip install --user -r requirements.txt - - run: - name: Run unit tests - command: | -workflows: - build_test: - jobs: - - run_tests +# build2: +# docker: +# - image: circleci/python:3.8.4 +# steps: +# - checkout +# - run: +# name: Install Python dependencies +# command: | +# echo 'export PATH=~$PATH:~/.local/bin' >> $BASH_ENV && source $BASH_ENV +# pip install --user -r requirements.txt +# - run: +# name: Run unit tests +# command: | +# workflows: +# build_test: +# jobs: +# - run_tests -workflows: - version: 2 +# workflows: +# version: 2 - my_workflow: - jobs: - -build - -build2: - requires: - -build +# my_workflow: +# jobs: +# -build +# -build2: +# requires: +# -build From f59c8a671bc0ca6e8474e1727ced96acd26f84c7 Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 12:13:30 +0300 Subject: [PATCH 07/13] name change From d345a5262c4be325a6f1f409439a3737cd3026b1 Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 12:17:43 +0300 Subject: [PATCH 08/13] avi From f5f6538865ad402a81415811e6f9ad36540960bc Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 12:21:30 +0300 Subject: [PATCH 09/13] test2 --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7448e38..a72de46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,8 @@ jobs: - run: name: Run unit tests command: | + afafds + # build2: # docker: From 0d1c7d4c6ae8d7e374538f6657c0dacc18843a1b Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 12:25:17 +0300 Subject: [PATCH 10/13] test234 --- .circleci/config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a72de46..069ba8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,12 +14,14 @@ jobs: - run: name: Run unit tests command: | - afafds - + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + afafa + affaa + # build2: # docker: -# - image: circleci/python:3.8.4 +# - image: circleci/python:3.8.4s # steps: # - checkout # - run: From 273c1473dfb4eb60b4bb313808b822f4c908776b Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 12:32:43 +0300 Subject: [PATCH 11/13] avi2 --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 069ba8d..521fd30 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,9 +14,7 @@ jobs: - run: name: Run unit tests command: | - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - afafa - affaa + # build2: From 7678ee0c02886489df92a65b5738f2b2f2cb5201 Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 13:54:21 +0300 Subject: [PATCH 12/13] yalla --- .circleci/config.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 521fd30..5097617 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,8 @@ version: 2.1 - jobs: - build: + run_tests: docker: - - image: circleci/python:3.8.4 + - image: circleci/python:3.7.4 steps: - checkout - run: @@ -14,7 +13,16 @@ jobs: - run: name: Run unit tests command: | - + pytest --junitxml=test-reports/junit.xml --html=test-reports/pytest_report.html --self-contained-html + - store_test_results: + path: test-reports + - store_artifacts: + path: test-reports +workflows: + build_test: + jobs: + - run_tests + # build2: From 64e11ee51be1c1932022f84d1cdd8677d0726726 Mon Sep 17 00:00:00 2001 From: avichai kaykov Date: Mon, 20 Jun 2022 18:10:33 +0300 Subject: [PATCH 13/13] testing --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5097617..376ae86 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,14 +10,14 @@ jobs: command: | echo 'export PATH=~$PATH:~/.local/bin' >> $BASH_ENV && source $BASH_ENV pip install --user -r requirements.txt - - run: - name: Run unit tests - command: | - pytest --junitxml=test-reports/junit.xml --html=test-reports/pytest_report.html --self-contained-html - - store_test_results: - path: test-reports - - store_artifacts: - path: test-reports + # - run: + # name: Run unit tests + # command: | + # pytest --junitxml=test-reports/junit.xml --html=test-reports/pytest_report.html --self-contained-html + # - store_test_results: + # path: test-reports + # - store_artifacts: + # path: test-reports workflows: build_test: jobs: