merge: Resolved conflicts

This commit is contained in:
Andrii Verbytskyi 2024-07-18 17:15:54 +02:00
commit 146f6d361a
202 changed files with 5515 additions and 2266 deletions

View file

@ -37,31 +37,6 @@ test-only:
--cov=rhodecode rhodecode
.PHONY: test-only-mysql
## run tests against mysql
test-only-mysql:
PYTHONHASHSEED=random \
py.test -x -vv -r xw -p no:sugar \
--cov-report=term-missing --cov-report=html \
--ini-config-override='{"app:main": {"sqlalchemy.db1.url": "mysql://root:qweqwe@localhost/rhodecode_test?charset=utf8"}}' \
--cov=rhodecode rhodecode
.PHONY: test-only-postgres
## run tests against postgres
test-only-postgres:
PYTHONHASHSEED=random \
py.test -x -vv -r xw -p no:sugar \
--cov-report=term-missing --cov-report=html \
--ini-config-override='{"app:main": {"sqlalchemy.db1.url": "postgresql://postgres:qweqwe@localhost/rhodecode_test"}}' \
--cov=rhodecode rhodecode
.PHONY: ruff-check
## run a ruff analysis
ruff-check:
ruff check --ignore F401 --ignore I001 --ignore E402 --ignore E501 --ignore F841 --exclude rhodecode/lib/dbmigrate --exclude .eggs --exclude .dev .
.PHONY: docs
## build docs
docs:
@ -88,6 +63,10 @@ web-build:
./rhodecode/tests/scripts/static-file-check.sh rhodecode/public/
rm -rf node_modules
.PHONY: ruff-check
## run a ruff analysis
ruff-check:
ruff check --ignore F401 --ignore I001 --ignore E402 --ignore E501 --ignore F841 --exclude rhodecode/lib/dbmigrate --exclude .eggs --exclude .dev .
.PHONY: pip-packages
## Show outdated packages
@ -109,8 +88,9 @@ dev-sh:
sudo apt-get install -y zsh carapace-bin
rm -rf /home/rhodecode/.oh-my-zsh
curl https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
echo "source <(carapace _carapace)" > /home/rhodecode/.zsrc
PROMPT='%(?.%F{green}√.%F{red}?%?)%f %B%F{240}%1~%f%b %# ' zsh
@echo "source <(carapace _carapace)" > /home/rhodecode/.zsrc
@echo "${RC_DEV_CMD_HELP}"
@PROMPT='%(?.%F{green}√.%F{red}?%?)%f %B%F{240}%1~%f%b %# ' zsh
.PHONY: dev-cleanup
@ -122,7 +102,9 @@ dev-cleanup:
.PHONY: dev-env
## make dev-env based on the requirements files and install develop of packages
## Cleanup: pip freeze | grep -v "^-e" | grep -v "@" | xargs pip uninstall -y
dev-env:
sudo -u root chown rhodecode:rhodecode /home/rhodecode/.cache/pip/
pip install build virtualenv
pushd ../rhodecode-vcsserver/ && make dev-env && popd
pip wheel --wheel-dir=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_rc_tools.txt -r requirements_test.txt -r requirements_debug.txt
@ -137,16 +119,13 @@ sh:
make dev-sh
## Allows changes of workers e.g make dev-srv-g workers=2
workers?=1
.PHONY: dev-srv
## run develop server instance, docker exec -it $(docker ps -q --filter 'name=dev-enterprise-ce') /bin/bash
## run gunicorn web server with reloader, use workers=N to set multiworker mode
dev-srv:
pserve --reload .dev/dev.ini
.PHONY: dev-srv-g
## run gunicorn multi process workers
dev-srv-g:
gunicorn --paste .dev/dev.ini --bind=0.0.0.0:10020 --config=.dev/gunicorn_config.py --timeout=120 --reload
gunicorn --paste=.dev/dev.ini --bind=0.0.0.0:10020 --config=.dev/gunicorn_config.py --timeout=120 --reload --workers=$(workers)
# Default command on calling make