Skip to content

Commit bc49eb4

Browse files
committed
chore: simplify tox compose setup and support devcontainers
Signed-off-by: Vladislav Polyakov <[email protected]>
1 parent e0b703b commit bc49eb4

File tree

4 files changed

+30
-32
lines changed

4 files changed

+30
-32
lines changed

compose.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
networks:
2+
default:
3+
external: true
4+
name: ydb-python-sdk_default
5+
6+
services:
7+
py-sdk-ydb:
8+
image: ydbplatform/local-ydb:trunk
9+
restart: always
10+
hostname: py-sdk-ydb
11+
ports:
12+
- 2135
13+
- 2136
14+
- 8765
15+
volumes:
16+
- ./ydb_certs:/ydb_certs
17+
environment:
18+
- YDB_USE_IN_MEMORY_PDISKS=true
19+
- YDB_ENABLE_COLUMN_TABLES=true
20+
- GRPC_TLS_PORT=2135
21+
- GRPC_PORT=2136
22+
- MON_PORT=8765

docker-compose-tls.yml

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

docker-compose.yml

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

tox.ini

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ usedevelop = True
99
install_command = pip install {opts} {packages}
1010
setenv =
1111
PYTHONPATH = {env:PYTHONPATH}{:}{toxinidir}
12+
REMOTE_CONTAINERS = {env:REMOTE_CONTAINERS}
1213
deps =
1314
-r{toxinidir}/test-requirements.txt
1415

@@ -32,14 +33,14 @@ deps =
3233

3334
[testenv:py]
3435
commands =
35-
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
36+
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
3637
deps =
3738
-r{toxinidir}/test-requirements.txt
3839
protobuf<6.0.0
3940

4041
[testenv:py-proto4]
4142
commands =
42-
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
43+
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
4344
deps =
4445
-r{toxinidir}/test-requirements.txt
4546
protobuf<5.0.0
@@ -48,35 +49,35 @@ deps =
4849
commands =
4950
pytest -v -m "not tls" \
5051
--cov-report html:cov_html --cov=ydb \
51-
--docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
52+
--docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
5253
deps =
5354
-r{toxinidir}/test-requirements.txt
5455
protobuf<5.0.0
5556

5657
[testenv:py-proto3]
5758
commands =
58-
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
59+
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
5960
deps =
6061
-r{toxinidir}/test-requirements.txt
6162
protobuf<4.0.0
6263

6364
[testenv:py-tls]
6465
commands =
65-
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
66+
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
6667
deps =
6768
-r{toxinidir}/test-requirements.txt
6869
protobuf<6.0.0
6970

7071
[testenv:py-tls-proto4]
7172
commands =
72-
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
73+
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
7374
deps =
7475
-r{toxinidir}/test-requirements.txt
7576
protobuf<5.0.0
7677

7778
[testenv:py-tls-proto3]
7879
commands =
79-
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
80+
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=compose.yml {posargs}
8081
deps =
8182
-r{toxinidir}/test-requirements.txt
8283
protobuf<4.0.0

0 commit comments

Comments
 (0)