Skip to content

Commit

Permalink
Merge branch 'master' into TP2000-1471--task-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
paulpepper-trade committed Dec 5, 2024
2 parents 02044ba + 8ecbdce commit 2bafa60
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ coverage.xml
*.py,cover
.hypothesis/
.pytest_cache/
allure-results/

# Translations
*.mo
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ test-fast:
test:
@echo
@echo "> Running tests..."
@${PYTHON} -m pytest -n=auto --dist=loadfile --alluredir=allure-results --nomigrations --cov --cov-report html:htmlcov --cov-report=term --cov-report=xml
@${PYTHON} -m pytest -n=auto --dist=loadfile --nomigrations --cov --cov-report html:htmlcov --cov-report=term --cov-report=xml

## docker-build: Build docker image
docker-build:
Expand All @@ -111,8 +111,8 @@ docker-test:
@echo "> Running tests in Docker..."
@${COMPOSE_LOCAL} ${DOCKER_RUN} \
${PROJECT} ${PYTHON} -m pytest -n=auto --dist=loadfile \
--alluredir=allure-results --nomigrations --cov --cov-report \
html:htmlcov --cov-report=term --cov-report=xml
--nomigrations --cov --cov-report \
html:htmlcov --cov-report=term --cov-report=xml

docker-test-fast:
@echo
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ force_single_line = true
[tool.pytest.ini_options]
DJANGO_SETTINGS_MODULE = "settings.test"
norecursedirs = [
"allure-results",
"csv",
"dist",
"docs",
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
aiohttp==3.10.11
allure-pytest-bdd==2.8.40
api-client==1.3.0
apsw==3.43.0.0
beautifulsoup4==4.10.0
Expand Down

0 comments on commit 2bafa60

Please sign in to comment.