Skip to content

Commit 17e90c3

Browse files
committed
Switched from green to pytest
1 parent 5cf2629 commit 17e90c3

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Run unit tests with green
6565
run: |
6666
export FLASK_APP=service:app
67-
green
67+
pytest --disable-warnings
6868
env:
6969
DATABASE_URI: "postgresql://postgres:pgs3cr3t@postgres:5432/testdb"
7070

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ lint: ## Run the linter
2626

2727
test: ## Run the unit tests
2828
$(info Running tests...)
29-
green -vvv --processes=1 --run-coverage --termcolor --minimum-coverage=95
29+
pytest --disable-warnings
3030

3131
##@ Runtime
3232

requirements.txt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
# Pinned dependencies that cause breakage
2-
Werkzeug==2.3.3
2+
Werkzeug==2.3.7
33
SQLAlchemy==2.0.0
44

55
# Runtime dependencies
6-
Flask==2.3.2
6+
Flask==2.3.3
77
Flask-SQLAlchemy==3.0.2
88
psycopg2==2.9.5
9-
python-dotenv==0.21.1
9+
python-dotenv==1.0.0
1010

1111
# Runtime tools
12-
gunicorn==20.1.0
12+
gunicorn==21.2.0
1313
honcho==1.1.0
1414

1515
# Code quality
16-
pylint==2.16.2
17-
flake8==6.0.0
18-
black==23.1.0
16+
pylint==2.17.5
17+
flake8==6.1.0
18+
black==23.7.0
1919

2020
# Testing dependencies
21-
green==3.4.3
22-
factory-boy==3.2.1
23-
coverage==7.1.0
21+
pytest==7.4.0
22+
pytest-pspec==0.0.4
23+
pytest-cov==4.1.0
24+
25+
factory-boy==3.3.0
26+
coverage==7.3.0
2427

2528
# Utilities
26-
httpie==3.2.1
29+
httpie==3.2.2

setup.cfg

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[green]
2-
verbose=3
3-
processes=1
4-
run-coverage=1
5-
termcolor=1
6-
minimum-coverage=95
7-
junit-report=./unittests.xml
1+
# setup configuration for tools
2+
[tool:pytest]
3+
minversion = 6.0
4+
addopts = --pspec --cov=service --disable-warnings
5+
testpaths =
6+
tests
7+
integration
88

99
[flake8]
1010
max-line-length = 127

0 commit comments

Comments
 (0)