From 1c7a90734a97132587d59fd526f450df18b41d40 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Sun, 29 Sep 2024 20:08:49 +0300 Subject: [PATCH 01/29] add rectangle.py --- rectangle.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 rectangle.py diff --git a/rectangle.py b/rectangle.py new file mode 100644 index 0000000000..e69de29bb2 From 47a9cd28484c25d700c3a669ae5d2f6fce343389 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Sun, 29 Sep 2024 20:13:16 +0300 Subject: [PATCH 02/29] add triangle.py --- triangle.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 triangle.py diff --git a/triangle.py b/triangle.py new file mode 100644 index 0000000000..e69de29bb2 From efad4894c35e28ada149cc5516817ca9da8df28a Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Sun, 29 Sep 2024 20:21:02 +0300 Subject: [PATCH 03/29] change in treangle.py --- rectangle.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rectangle.py b/rectangle.py index e69de29bb2..9c2a647688 100644 --- a/rectangle.py +++ b/rectangle.py @@ -0,0 +1,5 @@ +def area(a, b): + return a * b + +def perimeter(a, b): + return (a + b)*2 From d2b00e1d054536b0f281f2365382eb52128d71e9 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 3 Oct 2024 20:53:50 +0300 Subject: [PATCH 04/29] add triangle --- triangle.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/triangle.py b/triangle.py index e69de29bb2..64c153da16 100644 --- a/triangle.py +++ b/triangle.py @@ -0,0 +1,5 @@ +def area(a, h): + return a * h / 2 + +def perimeter(a, b, c): + return a + b + c From 1fdcb86e605eeea5040e52e440745e86690f15d3 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 18 Oct 2024 02:50:30 +0300 Subject: [PATCH 05/29] add comments --- circle.py | 15 ++++++++++++++- rectangle.py | 31 +++++++++++++++++++++++++++++++ square.py | 15 +++++++++++++++ triangle.py | 31 +++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) diff --git a/circle.py b/circle.py index c3eb8647c9..34e72a3ff7 100644 --- a/circle.py +++ b/circle.py @@ -1,10 +1,23 @@ import math - def area(r): + ''' + Функция принимает число r и возвращает площадь круга с радиусом r + + Пример: + input: 10 output: 314 + + ''' + return math.pi * r * r def perimeter(r): + ''' + Функция принимает число r и возвращает длину окружности с радиусом r + + Пример: + input: 100 output: 628 + ''' return 2 * math.pi * r diff --git a/rectangle.py b/rectangle.py index 9c2a647688..140ede7e43 100644 --- a/rectangle.py +++ b/rectangle.py @@ -1,5 +1,36 @@ def area(a, b): + ''' + Функция возвращает значение площади прямоугольника + + Входные данные: + + a: длина прямоугольника + b: ширина прямоугольника + + Возвращаемое значение: + + a*b: значение площади прямоугольника со сторонами a и b + + Пример: + + input: 5, 2 output: 10 + ''' return a * b def perimeter(a, b): + ''' + Функция возвращает значение периметра прямоугольника + + Входные данные: + + a: длина прямоугольника + b: ширина прямоугольника + + Возвращаемое значение: + + (a+b)*2: значение периметра прямоугольника со сторонами a и b + Пример: + + input: 5, 2 output: 14 + ''' return (a + b)*2 diff --git a/square.py b/square.py index 0f98724205..7efd285e94 100644 --- a/square.py +++ b/square.py @@ -1,7 +1,22 @@ def area(a): + ''' + Функция принимает число a и возвращает площадь квадрата со стороной a + + Пример: + input: 3 output: 9 + + ''' + return a * a def perimeter(a): + ''' + Функция принимает число a и возвращает gthbvtnh квадрата со стороной a + + Пример: + input: 3 output: 12 + + ''' return 4 * a diff --git a/triangle.py b/triangle.py index 64c153da16..05db57b26f 100644 --- a/triangle.py +++ b/triangle.py @@ -1,5 +1,36 @@ def area(a, h): + ''' + Функция возвращает значение площади треугольника + + Входные данные: + + a: основание треугольника + b: высота треугольника + + Возвращаемое значение: + + a*h/2: значение площади треугольника с ооснованием a и высотой h + Пример: + + input: 3, 6 output: 9 + ''' return a * h / 2 def perimeter(a, b, c): + ''' + Функция возвращает значение периметра треугольника + + Входные данные: + + a: сторона треугольника + b: сторона треугольника + с: сторона треугольника + + Возвращаемое значение: + + a+b+c: значение периметра треугольника со сторонами a, b и c + Пример: + + input: 2, 7, 3 output: 12 + ''' return a + b + c From 8ada4ae1c155aed500e2733d9e2eb7af1886442b Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 18 Oct 2024 02:54:04 +0300 Subject: [PATCH 06/29] add readme file --- docs/README.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 63f8727939..d00382750a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,10 +1,65 @@ -# Math formulas -## Area +# **Figures** +Функции данной программы помогут найти площадь и периметр таких фигур, как *квадрат*, *прямоугольник* +*круг* и *треугольник*. +Каждая функция принимает данные о фигуре и по этим данным высчитывает периметр или площадь фигуры. +Для вычислений в функциях были использованы следующие формулы: + +## Math formulas +### Area - Circle: S = πR² - Rectangle: S = ab - Square: S = a² +- Triangle: S = a*h/2 -## Perimeter +### Perimeter - Circle: P = 2πR - Rectangle: P = 2a + 2b -- Square: P = 4a \ No newline at end of file +- Square: P = 4a +- Triangle: P = a + b + c + + + +## Описаниее функций +### circle.py: + *area* получает на вход радиус окружности, возвращает площадь окружности с принимаем адресом + Пример: + input: 10 output: 314 + *preimetr* получает на вход радиус окружности и возвращает длину окружности + Пример: + input: 100 output: 628 + +### rectangle.py: + *area* получает на вход длину и ширину прямоугольника, возвращает площадь площадь прямоугольника + Пример: + input: 5, 2 output: 10 + *preimetr* получает на вход длину и ширину прямоугольника, возвращает периметр прямоугольника + Пример: + input: 5, 2 output: 14 + +### square.py: + *area* получает на вход сторону квадрата, возвращает площадь квадрата + Пример: + input: 3 output: 9 + *preimetr* получает на вход сторону квадрата и возвращает периметр квадрата + Пример: + input: 3 output: 12 + +### triangle.py: + *area* получает на вход основание и высоту треугольника, возвращает площадь треугольника + Пример: + input: 3, 6 output: 9 + *preimetr* получает на вход значение трёх сторон треугольника, возвращает периметр треугольника + Пример: + input: 2, 7, 3 output: 12 + + +# История изменениий + +1. Клонирование репозитория, который включал в себя файлы *square.py* и *circle.py* +2. Создание и добавление файла *rectangle.py* с функциями **area** и **perimetr** (1c7a987) +3. Создание и добавление файла *triangle.py* с функциями **area** и **perimetr** (47a9cd2) +4. Изменение ошибки в функции **perimetr** в *rectangle.py* и добавление файла с изменениями(efad489) +5. Дополнение функций комментариями (1fdcb86) + + + From b9841bdb3d0254a2217d0dbc81afc390aec93263 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Wed, 13 Nov 2024 23:21:21 +0300 Subject: [PATCH 07/29] the best readme --- docs/README.md | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/README.md b/docs/README.md index d00382750a..3e81a78d9a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -20,37 +20,37 @@ ## Описаниее функций -### circle.py: - *area* получает на вход радиус окружности, возвращает площадь окружности с принимаем адресом - Пример: - input: 10 output: 314 - *preimetr* получает на вход радиус окружности и возвращает длину окружности - Пример: - input: 100 output: 628 +### [circle.py](https://github.com/salt-caramel/geometric_lib/edit/labwork_2/circle.py): +- *area* получает на вход радиус окружности, возвращает площадь окружности с принимаем адресом + - Пример:\ + input: 10 output: 314 +- *preimetr* получает на вход радиус окружности и возвращает длину окружности + - Пример:\ + input: 100 output: 628 -### rectangle.py: - *area* получает на вход длину и ширину прямоугольника, возвращает площадь площадь прямоугольника - Пример: - input: 5, 2 output: 10 - *preimetr* получает на вход длину и ширину прямоугольника, возвращает периметр прямоугольника - Пример: - input: 5, 2 output: 14 +### [rectangle.py](https://github.com/salt-caramel/geometric_lib/edit/labwork_2/rectangle.py): +- *area* получает на вход длину и ширину прямоугольника, возвращает площадь площадь прямоугольника + - Пример:\ + input: 5, 2 output: 10 +- *preimetr* получает на вход длину и ширину прямоугольника, возвращает периметр прямоугольника + - Пример:\ + input: 5, 2 output: 14 -### square.py: - *area* получает на вход сторону квадрата, возвращает площадь квадрата - Пример: - input: 3 output: 9 - *preimetr* получает на вход сторону квадрата и возвращает периметр квадрата - Пример: - input: 3 output: 12 +### [square.py](https://github.com/salt-caramel/geometric_lib/edit/labwork_2/square.py): +- *area* получает на вход сторону квадрата, возвращает площадь квадрата + - Пример:\ + input: 3 output: 9 +- *preimetr* получает на вход сторону квадрата и возвращает периметр квадрата + - Пример:\ + input: 3 output: 12 -### triangle.py: - *area* получает на вход основание и высоту треугольника, возвращает площадь треугольника - Пример: - input: 3, 6 output: 9 - *preimetr* получает на вход значение трёх сторон треугольника, возвращает периметр треугольника - Пример: - input: 2, 7, 3 output: 12 +### [triangle.py](https://github.com/salt-caramel/geometric_lib/edit/labwork_2/triangle.py): +- *area* получает на вход основание и высоту треугольника, возвращает площадь треугольника + - Пример:\ + input: 3, 6 output: 9 +- *preimetr* получает на вход значение трёх сторон треугольника, возвращает периметр треугольника + - Пример:\ + input: 2, 7, 3 output: 12 # История изменениий From 2e567a4a2ebc58daaf59b8b94e691508eef4fd69 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 14 Nov 2024 23:52:19 +0300 Subject: [PATCH 08/29] add labwork_4 --- circle.py | 2 +- docs/README.md | 36 +++++++++++++++++++++++ rectangle.py | 2 +- square.py | 2 +- tests.py | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ triangle.py | 2 +- 6 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 tests.py diff --git a/circle.py b/circle.py index 34e72a3ff7..9fab6a07b5 100644 --- a/circle.py +++ b/circle.py @@ -12,7 +12,7 @@ def area(r): return math.pi * r * r -def perimeter(r): +def perimetr(r): ''' Функция принимает число r и возвращает длину окружности с радиусом r diff --git a/docs/README.md b/docs/README.md index 3e81a78d9a..01b8fc0a74 100644 --- a/docs/README.md +++ b/docs/README.md @@ -62,4 +62,40 @@ 5. Дополнение функций комментариями (1fdcb86) +# Тестирование +## План тестирования + +1. **Цель:** проверить корректность выполнения расчётов, а также поведения программы при вводе некорректных данных (корректные данные: неотрицательные числа)\ +**Задачи**: + - проверить корректность выполнения расчётов проограммы *circle.py*; + - проверить поведение программы *circle.py* при вводе некорретных данных; + - проверить корректность выполнения расчётов проограммы *rectangle.py*; + - проверить поведение программы *rectangle.py* при вводе некорретных данных; + - проверить корректность выполнения расчётов проограммы *square.py*; + - проверить поведение программы *square.py* при вводе некорретных данных; + - проверить корректность выполнения расчётов проограммы *triangle.py*; + - проверить поведение программы *triangle.py* при вводе некорретных данных; +2. Каждая программа должна выполнять расчёты согласно математическим формулам. При вводе некорректных данных должен быть вывод соответственных ошибок; +3. **Область тестирования:** программы *circle.py* (функции `area()` и `perimetr()`), *rectangle.py* (функции `area()` и `perimetr()`), *square.py* (функции `area()` и `perimetr()`), *triangle.py* (функции `area()` и `perimetr()`); +4. **Стратегия тестирования**: тестирование функциональности с помощью unittest; +5. **Критерии приемки и ожидаемые результаты:** + + | Название программы и функции | Описание теста | Входные данные | Ожидаемый вывод | Вывод программы |Вердикт | дата проведения тестов | + | ---------------------------- | -------------------------------------------------- | -------------- | --------------- | -----------------------|------- | ---------------------- | + | сircle.py (`area()`) | проверка корректности выполнения вычислений | 10 | ~314 | 314.159 | OK | 14.11.2024 | + | сircle.py (`area()`) | проверка поведения при введении отрицательных чисел| -5 |"Incorrect input"| 78.5398 |Warning | 14.11.2024 | + | сircle.py (`perimetr()`) | проверка корректности выполнения вычислений | 100 | ~628 | 628.3185 | OK | 14.11.2024 | + | сircle.py (`perimetr()`) | проверка поведения при введении строки | "арбуз" |"Incorrect input"| TypeError |Warning | 14.11.2024 | + | rectangle.py (`area()`) | проверка корректности выполнения вычислений | 5, 2 | 10 | 10 | OK | 14.11.2024 | + | rectangle.py (`area()`) | проверка поведения при введении строки | "lol", 8 |"Incorrect input"|lollollollollollollollol|Warning | 14.11.2024 | + | rectangle.py (`perimetr()`) | проверка корректности выполнения вычислений | 5, 2 | 14 | 14 | OK | 14.11.2024 | + | rectangle.py (`perimetr()`) | проверка поведения при введении отрицательных чисел| -3, 5 |"Incorrect input"| 4 |Warning | 14.11.2024 | + | square.py (`area()`) | проверка корректности выполнения вычислений | 3 | 9 | 9 | OK | 14.11.2024 | + | square.py (`area()`) | проверка поведения при введении отрицательных чисел| -7 |"Incorrect input"| 49 |Warning | 14.11.2024 | + | square.py (`perimetr()`) | проверка корректности выполнения вычислений | 3 | 12 | 12 | OK | 14.11.2024 | + | square.py (`perimetr()`) | проверка поведения при введении строки | "vibe" |"Incorrect input"| vibevibevibevibe |Warning | 14.11.2024 | + | triangle.py (`area()`) | проверка корректности выполнения вычислений | 3, 6 | 9 | 9 | OK | 14.11.2024 | + | triangle.py (`area()`) | проверка поведения при введении строки | "a", "b" |"Incorrect input"| TypeError |Warning | 14.11.2024 | + | triangle.py (`perimetr()`) | проверка корректности выполнения вычислений | 2, 7, 3 | 12 | 12 | OK | 14.11.2024 | + | triangle.py (`perimetr()`) | проверка поведения при введении отрицательных чисел| -4, -1, -6 |"Incorrect input"| -11 |Warning | 14.11.2024 | \ No newline at end of file diff --git a/rectangle.py b/rectangle.py index 140ede7e43..8516d16f89 100644 --- a/rectangle.py +++ b/rectangle.py @@ -17,7 +17,7 @@ def area(a, b): ''' return a * b -def perimeter(a, b): +def perimetr(a, b): ''' Функция возвращает значение периметра прямоугольника diff --git a/square.py b/square.py index 7efd285e94..217bb53048 100644 --- a/square.py +++ b/square.py @@ -11,7 +11,7 @@ def area(a): return a * a -def perimeter(a): +def perimetr(a): ''' Функция принимает число a и возвращает gthbvtnh квадрата со стороной a diff --git a/tests.py b/tests.py new file mode 100644 index 0000000000..cf45bd3c53 --- /dev/null +++ b/tests.py @@ -0,0 +1,77 @@ +import unittest +import circle, rectangle, square, triangle + + +class CircleTestCase(unittest.TestCase): + def test_circle_area_res(self): + res = circle.area(10) + self.assertEqual(res, 314) + + def test_circle_area_minus(self): + res = circle.area(-5) + self.assertEqual(res, "Incorrect input") + + def test_circle_perimetr_res(self): + res = circle.perimetr(100) + self.assertEqual(res, 628) + + def test_circle_perimetr_str(self): + res = circle.perimetr("арбуз") + self.assertEqual(res, "Incorrect input") + +class RectangleTestCase(unittest.TestCase): + + def test_rectangle_area_res(self): + res = rectangle.area(5, 2) + self.assertEqual(res, 10) + + def test_rectangle_area_str(self): + res = rectangle.area("lol", 8) + self.assertEqual(res, "Incorrect input") + + def test_rectangle_perimetr_res(self): + res = rectangle.perimetr(5, 2) + self.assertEqual(res, 14) + + def test_rectangle_perimetr_minus(self): + res = rectangle.perimetr(-3, 5) + self.assertEqual(res, "Incorrect input") + +class SquareTestCase(unittest.TestCase): + def test_square_area_res(self): + res = square.area(3) + self.assertEqual(res, 9) + + def test_square_area_minus(self): + res = square.area(-7) + self.assertEqual(res, "Incorrect input") + + def test_square_perimetr_res(self): + res = square.perimetr(3) + self.assertEqual(res, 12) + + def test_square_perimetr_str(self): + res = square.perimetr("vibe") + self.assertEqual(res, "Incorrect input") + +class TriangleTestCase(unittest.TestCase): + def test_triangle_area_res(self): + res = triangle.area(3, 6) + self.assertEqual(res, 9) + + def test_triangle_area_str(self): + res = triangle.area("a", "b") + self.assertEqual(res, "Incorrect input") + + def test_triangle_perimetr_res(self): + res = triangle.perimetr(2, 7, 3) + self.assertEqual(res, 12) + + def test_triangle_perimetr_minus(self): + res = triangle.perimetr(-4, -1, -6) + self.assertEqual(res, "Incorrect input") + + + + + \ No newline at end of file diff --git a/triangle.py b/triangle.py index 05db57b26f..57cfdfee31 100644 --- a/triangle.py +++ b/triangle.py @@ -16,7 +16,7 @@ def area(a, h): ''' return a * h / 2 -def perimeter(a, b, c): +def perimetr(a, b, c): ''' Функция возвращает значение периметра треугольника From 04c86d66d60959a777b7165f588ba8db2211070e Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 22:43:37 +0300 Subject: [PATCH 09/29] nothing --- circle.py | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.py b/circle.py index 9fab6a07b5..12e320697f 100644 --- a/circle.py +++ b/circle.py @@ -10,6 +10,7 @@ def area(r): ''' return math.pi * r * r + def perimetr(r): From b1267704aa9d1d98c89925bba2184fbbc103a14a Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:07:20 +0300 Subject: [PATCH 10/29] add main.yml --- .github/workflows/main.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..a1358e983e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,19 @@ +name: Tests +on: + push: + branches: + - 'labwork_5' + +jobs: + Test: + name: unit-tests + runs-on: [ubuntu-latest, windows-latest] + steps: + - name: check-out repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.8' + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From cb663e08a6fb3aed8c4d39edb7f9336d598f8dc6 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:13:19 +0300 Subject: [PATCH 11/29] test --- circle.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.py b/circle.py index 12e320697f..518aa9310e 100644 --- a/circle.py +++ b/circle.py @@ -9,8 +9,8 @@ def area(r): ''' + return math.pi * r * r - def perimetr(r): @@ -20,5 +20,6 @@ def perimetr(r): Пример: input: 100 output: 628 ''' + return 2 * math.pi * r From 45c252779bf106119423df288da09644e8a5f12d Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:40:08 +0300 Subject: [PATCH 12/29] test 2 --- .github/workflows/main.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1358e983e..8fe7e1e970 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,15 +5,22 @@ on: - 'labwork_5' jobs: - Test: - name: unit-tests - runs-on: [ubuntu-latest, windows-latest] - steps: - - name: check-out repository - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.8' - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + build: + Test: + name: unit-tests + runs-on: [ubuntu-latest, windows-latest] + + steps: + - name: check-out repository + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 0368b881f0edffff94bc7528e65e696a2a68b33f Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:43:50 +0300 Subject: [PATCH 13/29] test 3 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fe7e1e970..56f4533063 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: branches: - 'labwork_5' -jobs: +job: build: Test: name: unit-tests From 469ef74dce78a4ffc85a84266acabee15b32a887 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:45:28 +0300 Subject: [PATCH 14/29] test 4 --- .github/workflows/main.yml | 41 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 56f4533063..cab98c7aa9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,23 +4,24 @@ on: branches: - 'labwork_5' -job: - build: - Test: - name: unit-tests - runs-on: [ubuntu-latest, windows-latest] - - steps: - - name: check-out repository - uses: actions/checkout@v3 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file +jobs: + job1: + build: + Test: + name: unit-tests + runs-on: [ubuntu-latest, windows-latest] + + steps: + - name: check-out repository + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From ed66116864dfe58be4c8f785d01dde98e7a89dc9 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:49:01 +0300 Subject: [PATCH 15/29] test 5 --- .github/workflows/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cab98c7aa9..530f912336 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,18 +10,14 @@ jobs: Test: name: unit-tests runs-on: [ubuntu-latest, windows-latest] - steps: - name: check-out repository uses: actions/checkout@v3 - - name: Set up Python uses: actions/setup-python@v4 with: python-version: 3.8 - - name: Upgrade libs run: python -m pip install --upgrade pip requests - - name: to do tests run: python -m unittest tests.py \ No newline at end of file From 7b3f04855bfddc23369f64a845ad6a7837e8da84 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Thu, 28 Nov 2024 23:52:20 +0300 Subject: [PATCH 16/29] test 6 --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 530f912336..84b8079086 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,8 +7,7 @@ on: jobs: job1: build: - Test: - name: unit-tests + name: unit-tests runs-on: [ubuntu-latest, windows-latest] steps: - name: check-out repository From 0771f358f24274df12c10b38df2971a9c425dd05 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:14:02 +0300 Subject: [PATCH 17/29] test 7 --- .github/workflows/main.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84b8079086..c2b3b5f27c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,18 +5,21 @@ on: - 'labwork_5' jobs: - job1: + test: build: name: unit-tests - runs-on: [ubuntu-latest, windows-latest] - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From f99ad0d5a879324a3415a0443af0f5aff9940523 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:18:47 +0300 Subject: [PATCH 18/29] test 8 --- .github/workflows/main.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2b3b5f27c..f871589a68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,14 +12,15 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 1ea4cdb19f33d852c6d2fc9dfb1598b545a8af90 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:22:25 +0300 Subject: [PATCH 19/29] test 9 --- .github/workflows/main.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f871589a68..843ae2a60d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,20 +7,19 @@ on: jobs: test: build: - name: unit-tests - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 1931a13b41c8d02bc4c68202a22d5a7f6ca1c389 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:24:45 +0300 Subject: [PATCH 20/29] test 10 --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 843ae2a60d..bb6f804f8b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,8 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] - + os: [ubuntu-latest, windows-latest] steps: - name: check-out repository uses: actions/checkout@v3 From 3e9c5512763e76427a2bb014e6e4d549ad1740c7 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:31:11 +0300 Subject: [PATCH 21/29] test 11 --- .github/workflows/main.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb6f804f8b..f2cec5a053 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,18 +7,19 @@ on: jobs: test: build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + example_matrix: + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From a13e212b878562da2b315876809e73e6415ae44d Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:33:19 +0300 Subject: [PATCH 22/29] test 12 --- .github/workflows/main.yml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2cec5a053..8b1310d3cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,21 +5,22 @@ on: - 'labwork_5' jobs: - test: - build: - example_matrix: - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + job1: + test: + build: + example_matrix: + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 0bf55ec74922a16b4156e3d94ad1c45193628e60 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:38:32 +0300 Subject: [PATCH 23/29] test 13 --- .github/workflows/main.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b1310d3cf..d6b1a64136 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,20 +7,18 @@ on: jobs: job1: test: - build: - example_matrix: - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From be7c2dfb804596ecf9e43646a131a08838e9bc3b Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:40:15 +0300 Subject: [PATCH 24/29] test 14 --- .github/workflows/main.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6b1a64136..0e97b062f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,18 +7,19 @@ on: jobs: job1: test: - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + build: + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 1efe83b8ff34c49e9d50b28937c2b18549a2c7d5 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:41:58 +0300 Subject: [PATCH 25/29] test 15 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e97b062f2..95813f7eb8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,10 +8,10 @@ jobs: job1: test: build: + runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} + os: [ubuntu-latest, windows-latest] steps: - name: check-out repository uses: actions/checkout@v3 From 5d9107bccca72a3143d8787c7af614a66609103c Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:42:50 +0300 Subject: [PATCH 26/29] test 16 --- .github/workflows/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95813f7eb8..e2d0f948f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,13 +13,13 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + - name: check-out repository + uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 08629febd519f2d2e10212f5ca13e19afc403e13 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:47:54 +0300 Subject: [PATCH 27/29] test 17 --- .github/workflows/main.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2d0f948f4..91c2404463 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,21 +5,19 @@ on: - 'labwork_5' jobs: - job1: - test: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - steps: - - name: check-out repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Upgrade libs - run: python -m pip install --upgrade pip requests - - name: to do tests - run: python -m unittest tests.py \ No newline at end of file + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + steps: + - name: check-out repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Upgrade libs + run: python -m pip install --upgrade pip requests + - name: to do tests + run: python -m unittest tests.py \ No newline at end of file From 8a6b6e46d23f988504a04f9cb00d062b6dae18c1 Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 00:49:36 +0300 Subject: [PATCH 28/29] test 18 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91c2404463..7dbab3a07d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: os: [ ubuntu-latest, windows-latest ] steps: - name: check-out repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v3 with: From 2e4d5efa9fb7c9c13edb8bce5c5e85394e0aa04f Mon Sep 17 00:00:00 2001 From: Elizaveta Tkachenko Date: Fri, 29 Nov 2024 09:17:27 +0300 Subject: [PATCH 29/29] test 19 --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7dbab3a07d..42589429b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest, windows-latest ] + fail-fast: false steps: - name: check-out repository uses: actions/checkout@v3