Skip to content

Commit 4666735

Browse files
committed
Migrate to yhttp-dev >= 3.1
1 parent 6a28a79 commit 4666735

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

.flake8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
ignore = RST303,RST304,W503
2+
ignore = W503
33
per-file-ignores =
44
yhttp/ext/dbmanager/__init__.py: F401
5-
tests/conftest.py: F401
5+
tests/conftest.py: F401, F811

requirements-ci.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ coveralls
66
pytest >= 4.4.0
77
pytest-cov
88
flake8
9+
yhttp-dev >= 3.1

tests/conftest.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
import os
22

33
import pytest
4+
from yhttp.dev.fixtures import cicd
45
from yhttp.ext.dbmanager import PostgresqlManager
56

67

7-
CICD = 'CI' in os.environ \
8-
and os.environ['CI'] \
9-
and 'GITHUB_RUN_ID' in os.environ
10-
11-
12-
@pytest.fixture
13-
def cicd():
14-
return CICD
15-
16-
178
@pytest.fixture
189
def dbmanager(cicd):
19-
host = CICD and 'localhost' or None
20-
user = CICD and 'postgres' or None
21-
pass_ = CICD and 'postgres' or None
10+
host = cicd and 'localhost' or None
11+
user = cicd and 'postgres' or None
12+
pass_ = cicd and 'postgres' or None
2213
return PostgresqlManager(
2314
host=os.environ.get('YHTTP_DB_DEFAULT_HOST', host),
2415
user=os.environ.get('YHTTP_DB_DEFAULT_ADMINUSER', user),

0 commit comments

Comments
 (0)