Skip to content

Commit 006dc20

Browse files
authored
Merge pull request #292 from NikolayBaranovv/refactor_add_black_and_isort
Refactor: add black and isort
2 parents 7b5795d + e68af22 commit 006dc20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2770
-1614
lines changed

.pre-commit-config.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
repos:
2+
- repo: https://github.com/psf/black
3+
rev: 24.8.0
4+
hooks:
5+
- id: black
6+
language_version: python3
7+
- repo: https://github.com/pycqa/isort
8+
rev: 5.13.2
9+
hooks:
10+
- id: isort
11+
name: isort (python)
12+
args: ["--profile", "black"]

bin/run_tests_with_docker.py

Lines changed: 63 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,80 @@
33
import os
44
from subprocess import run
55

6-
parser = argparse.ArgumentParser(description='Run tests with dockerized MongoDB')
7-
parser.add_argument('--mongodb-version', type=str, help='MongoDB version', required=True)
6+
parser = argparse.ArgumentParser(description="Run tests with dockerized MongoDB")
7+
parser.add_argument(
8+
"--mongodb-version", type=str, help="MongoDB version", required=True
9+
)
810
# for test_basic
9-
parser.add_argument('--mongodb-port', type=str, help='MongoDB Port (default 27017)', default='27017')
11+
parser.add_argument(
12+
"--mongodb-port", type=str, help="MongoDB Port (default 27017)", default="27017"
13+
)
1014
# for test_auth
11-
parser.add_argument('--mongodb-port-auth', type=str, help='MongoDB Port (default 27018)', default='27018')
15+
parser.add_argument(
16+
"--mongodb-port-auth",
17+
type=str,
18+
help="MongoDB Port (default 27018)",
19+
default="27018",
20+
)
1221
# for test_replicaset
13-
parser.add_argument('--mongodb-port-1', type=str, help='MongoDB 1 Replica Port (default 37017)', default='37017')
14-
parser.add_argument('--mongodb-port-2', type=str, help='MongoDB 2 Replica Port (default 37018)', default='37018')
15-
parser.add_argument('--mongodb-port-3', type=str, help='MongoDB 3 Replica Port (default 37019)', default='37019')
22+
parser.add_argument(
23+
"--mongodb-port-1",
24+
type=str,
25+
help="MongoDB 1 Replica Port (default 37017)",
26+
default="37017",
27+
)
28+
parser.add_argument(
29+
"--mongodb-port-2",
30+
type=str,
31+
help="MongoDB 2 Replica Port (default 37018)",
32+
default="37018",
33+
)
34+
parser.add_argument(
35+
"--mongodb-port-3",
36+
type=str,
37+
help="MongoDB 3 Replica Port (default 37019)",
38+
default="37019",
39+
)
1640

1741
args, tox_args = parser.parse_known_args()
1842

19-
mongodb_network_name = 'txmongo-tests-advanced-network'
20-
run(['docker', 'network', 'create', mongodb_network_name])
43+
mongodb_network_name = "txmongo-tests-advanced-network"
44+
run(["docker", "network", "create", mongodb_network_name])
2145

22-
mongodb_basic_test_container_name = 'txmongo-tests-basic-mongodb'
46+
mongodb_basic_test_container_name = "txmongo-tests-basic-mongodb"
2347

24-
run(['docker', 'run', '--rm', '-d', '-p', f'{args.mongodb_port}:27017', '--name', mongodb_basic_test_container_name, f'mongo:{args.mongodb_version}'])
48+
run(
49+
[
50+
"docker",
51+
"run",
52+
"--rm",
53+
"-d",
54+
"-p",
55+
f"{args.mongodb_port}:27017",
56+
"--name",
57+
mongodb_basic_test_container_name,
58+
f"mongo:{args.mongodb_version}",
59+
]
60+
)
2561

26-
run(['tox', *tox_args], env={
27-
**os.environ,
28-
'TXMONGO_RUN_MONGOD_IN_DOCKER': 'yes',
29-
'TXMONGO_MONGOD_DOCKER_VERSION': args.mongodb_version,
30-
'TXMONGO_MONGOD_DOCKER_PORT_AUTH': args.mongodb_port_auth,
31-
'TXMONGO_MONGOD_DOCKER_PORT_1': args.mongodb_port_1,
32-
'TXMONGO_MONGOD_DOCKER_PORT_2': args.mongodb_port_2,
33-
'TXMONGO_MONGOD_DOCKER_PORT_3': args.mongodb_port_3,
34-
'TXMONGO_MONGOD_DOCKER_NETWORK_NAME': mongodb_network_name,
35-
})
36-
run(['docker', 'stop', mongodb_basic_test_container_name])
62+
run(
63+
["tox", *tox_args],
64+
env={
65+
**os.environ,
66+
"TXMONGO_RUN_MONGOD_IN_DOCKER": "yes",
67+
"TXMONGO_MONGOD_DOCKER_VERSION": args.mongodb_version,
68+
"TXMONGO_MONGOD_DOCKER_PORT_AUTH": args.mongodb_port_auth,
69+
"TXMONGO_MONGOD_DOCKER_PORT_1": args.mongodb_port_1,
70+
"TXMONGO_MONGOD_DOCKER_PORT_2": args.mongodb_port_2,
71+
"TXMONGO_MONGOD_DOCKER_PORT_3": args.mongodb_port_3,
72+
"TXMONGO_MONGOD_DOCKER_NETWORK_NAME": mongodb_network_name,
73+
},
74+
)
75+
run(["docker", "stop", mongodb_basic_test_container_name])
3776

38-
run(['docker', 'network', 'rm', "--force", mongodb_network_name])
77+
run(["docker", "network", "rm", "--force", mongodb_network_name])
3978

4079
# if need manually delete containers:
4180
# docker container rm --force $(docker ps -q --filter "name=txmongo-tests-")
4281
# run some version:
43-
# ./bin/run_tests_with_docker.py --mongodb-version 4.4 -f advanced py3.11 pymongo480 tw247
82+
# ./bin/run_tests_with_docker.py --mongodb-version 4.4 -f advanced py3.11 pymongo480 tw247

0 commit comments

Comments
 (0)