Skip to content

Commit f07d93b

Browse files
authored
Merge pull request #667 from iKostanOrg/master
Merge from master
2 parents 8a3e073 + cbce6f1 commit f07d93b

File tree

9 files changed

+14
-89
lines changed

9 files changed

+14
-89
lines changed

.circleci/config.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
name: CircleCI Workflow
23
version: 2.1 # use CircleCI 2.1
34
orbs:
45
python: circleci/python@2.1.1
@@ -26,27 +27,27 @@ jobs: # A basic unit of work in a run
2627
- python/install-packages:
2728
pip-dependency-file: requirements.txt
2829
pkg-manager: pip
29-
- run:
30-
command: |
31-
echo $PATH
32-
name: Display system path
3330
- run:
3431
command: |
3532
python -m pip install pytest
3633
name: Install pytest
3734
- run:
3835
command: |
39-
pytest --version
36+
python -m pytest --version
4037
name: Show pytest version
4138
- run:
4239
command:
43-
sudo mkdir /home/circleci/project/test-results
40+
mkdir /home/circleci/project/test-results
4441
name: Create test-results folder
4542
- run:
46-
command:
47-
python -m pytest
43+
command: |
44+
python -m pytest . -v --junitxml=test-results/test-results.xml
4845
name: Run tests with pytest
49-
# Upload test results for display in Test Summary:
46+
- run:
47+
command: |
48+
ls
49+
ls test-results/
50+
name: List test files
5051
# https://circleci.com/docs/2.0/collect-test-data/
5152
- store_test_results:
5253
path: test-results/

.github/workflows/kyu_2/flake8_kyu2.yml renamed to .github/workflows/flake8_kyu2.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
name: Flake8 for kyu2
33

44
on: # yamllint disable-line rule:truthy
5-
workflow_call:
65
push:
76
branches:
87
- kyu2

.github/workflows/kyu2.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/lint_test_build_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- mypy
5555
- yamllint
5656
- pydocstyle
57-
uses: iKostanOrg/codewars/.github/workflows/kyu_2/pytype_kyu2.yml@master
57+
uses: iKostanOrg/codewars/.github/workflows/pytype_kyu2.yml@master
5858
pytype_kyu3:
5959
name: PyType Lint (kyu3)
6060
needs:

.github/workflows/kyu_2/mypy_kyu2.yml renamed to .github/workflows/mypy_kyu2.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
name: MyPy for kyu2
33

44
on: # yamllint disable-line rule:truthy
5-
workflow_call:
65
push:
76
branches:
8-
- 'kyu2'
7+
- kyu2
98

109
permissions:
1110
contents: read

.github/workflows/kyu_2/pydocstyle_kyu2.yml renamed to .github/workflows/pydocstyle_kyu2.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
name: pydocstyle for kyu2
33

44
on: # yamllint disable-line rule:truthy
5-
workflow_call:
65
push:
76
branches:
8-
- 'kyu2'
7+
- kyu2
98

109
permissions:
1110
contents: read

.github/workflows/kyu_2/pylint_kyu2.yml renamed to .github/workflows/pylint_kyu2.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
name: PyLint for kyu2
33

44
on: # yamllint disable-line rule:truthy
5-
workflow_call:
65
push:
76
branches:
8-
- 'kyu2'
7+
- kyu2
98

109
permissions:
1110
contents: read

0 commit comments

Comments
 (0)