Skip to content

Commit 87f105b

Browse files
committed
Fix docker command
1 parent 0fe67f2 commit 87f105b

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

start

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ else
77
fi
88

99
if [[ "${1}" == "down" ]]; then
10-
docker-compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) down
10+
docker compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) down
1111
else
12-
docker-compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) up -d
12+
docker compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) up -d
1313
fi

testing/test_unit.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import sys
44
from pathlib import Path
55

6-
import pkg_resources
76
import pytest
87
from assertpy import assert_that
98

@@ -17,19 +16,13 @@ def run(pytester, path="report.html", cmd_flags=None):
1716

1817

1918
def file_content():
20-
try:
21-
return (
22-
importlib.resources.files("pytest_html")
23-
.joinpath("assets", "style.css")
24-
.read_bytes()
25-
.decode("utf-8")
26-
.strip()
27-
)
28-
except AttributeError:
29-
# Needed for python < 3.9
30-
return pkg_resources.resource_string(
31-
"pytest_html", os.path.join("assets", "style.css")
32-
).decode("utf-8")
19+
return (
20+
importlib.resources.files("pytest_html")
21+
.joinpath("assets", "style.css")
22+
.read_bytes()
23+
.decode("utf-8")
24+
.strip()
25+
)
3326

3427

3528
def test_duration_format_deprecation_warning(pytester):

0 commit comments

Comments
 (0)