core: cleanup pyproject and makefile

Makefile

@@ -1,130 +1,130 b''
 .DEFAULT_GOAL := help
 
 # Pretty print values cf. https://misc.flogisoft.com/bash/tip_colors_and_formatting
 RESET := \033[0m # Reset all formatting
 GREEN := \033[0;32m # Resets before setting 16b colour (32 -- green)
 YELLOW := \033[0;33m
 ORANGE := \033[0;38;5;208m # Reset then set 256b colour (208 -- orange)
 PEACH := \033[0;38;5;216m
 
 
 ## ---------------------------------------------------------------------------------- ##
 ## ------------------------- Help usage builder ------------------------------------- ##
 ## ---------------------------------------------------------------------------------- ##
 # use '# >>> Build commands' to create section
 # use '# target: target description' to create help for target
 .PHONY: help
 help:
 	@echo "Usage:"
 	@cat $(MAKEFILE_LIST) | grep -E '^# >>>|^# [A-Za-z0-9_.-]+:' | sed -E 's/^# //' | awk ' \
 		BEGIN { \
 			green="\033[32m"; \
 			yellow="\033[33m"; \
 			reset="\033[0m"; \
 			section=""; \
 		} \
 		/^>>>/ { \
 			section=substr($$0, 5); \
 			printf "\n" green ">>> %s" reset "\n", section; \
 			next; \
 		} \
 		/^([A-Za-z0-9_.-]+):/ { \
 			target=$$1; \
 			gsub(/:$$/, "", target); \
 			description=substr($$0, index($$0, ":") + 2); \
 			if (description == "") { description="-"; } \
 			printf " - " yellow "%-35s" reset " %s\n", target, description; \
 		} \
 	'
 
 # required for pushd to work..
 SHELL = /bin/bash
 
 # >>> Tests commands
 
 .PHONY: clean
 # clean: Cleanup compiled and cache py files
 clean:
 	make test-clean
 	find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' -o -iname '*.orig' \) -exec rm '{}' ';'
 	find . -type d -name "build" -prune -exec rm -rf '{}' ';'
 
 
 .PHONY: test
 # test: run test-clean and tests
 test:
 	make test-clean
-	unset RC_SQLALCHEMY_DB1_URL && unset RC_DB_URL && make test-only
+	make test-only
 
 
 .PHONY: test-clean
 # test-clean: run test-clean and tests
 test-clean:
 	rm -rf coverage.xml htmlcov junit.xml pylint.log result
 	find . -type d -name "__pycache__" -prune -exec rm -rf '{}' ';'
 	find . -type f \( -iname '.coverage.*' \) -exec rm '{}' ';'
 
 
 .PHONY: test-only
 # test-only: Run tests only without cleanup
 test-only:
 	PYTHONHASHSEED=random \
 	py.test -x -vv -r xw -p no:sugar \
 	--cov-report=term-missing --cov-report=html \
 	--cov=vcsserver vcsserver
 
 # >>> Dev commands
 
 
 
 .PHONY: dev-sh
 # dev-sh: make dev-sh
 dev-sh:
 	sudo echo "deb [trusted=yes] https://apt.fury.io/rsteube/ /" | sudo tee -a "/etc/apt/sources.list.d/fury.list"
 	sudo apt-get update
 	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
 	@echo "${RC_DEV_CMD_HELP}"
 	@PROMPT='%(?.%F{green}√.%F{red}?%?)%f %B%F{240}%1~%f%b %# ' zsh
 
 
 .PHONY: dev-cleanup
 # dev-cleanup: Cleanup: pip freeze | grep -v "^-e" | grep -v "@" | xargs pip uninstall -y
 dev-cleanup:
 	pip freeze | grep -v "^-e" | grep -v "@" | xargs pip uninstall -y
 	rm -rf /tmp/*
 
 
 .PHONY: dev-env
 # 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
 	pip wheel --wheel-dir=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_test.txt -r requirements_debug.txt
 	pip install --no-index --find-links=/home/rhodecode/.cache/pip/wheels -r requirements.txt -r requirements_test.txt -r requirements_debug.txt
 	pip install -e .
 
 
 .PHONY: sh
 # sh: shortcut for make dev-sh dev-env
 sh:
 	make dev-env
 	make dev-sh
 
 
 ## Allows changes of workers e.g make dev-srv-g workers=2
 workers?=1
 
 .PHONY: dev-srv
 # dev-srv: run gunicorn web server with reloader, use workers=N to set multiworker mode, workers=N allows changes of workers
 dev-srv:
 	gunicorn --paste=.dev/dev.ini --bind=0.0.0.0:10010 --config=.dev/gunicorn_config.py --reload --workers=$(workers)
 
 .PHONY: ruff-check
 # 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 .
 

pyproject.toml

@@ -1,94 +1,89 b''
 [build-system]
 requires = ["setuptools>=61.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "rhodecode-vcsserver"
 description = "Version Control System Server for RhodeCode"
 authors = [
     {name = "RhodeCode GmbH", email = "[e-mail]"},
 ]
 
 license = {text = "GPL V3"}
 requires-python = ">=3.10"
 dynamic = ["version", "readme", "dependencies", "optional-dependencies"]
 classifiers = [
     'Development Status :: 6 - Mature',
     'Intended Audience :: Developers',
     'Operating System :: OS Independent',
     'Topic :: Software Development :: Version Control',
     'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
     'Programming Language :: Python :: 3.10',
 ]
 
 [project.entry-points."paste.app_factory"]
 main = "vcsserver.http_main:main"
 
 
 [tool.setuptools]
 packages = ["vcsserver"]
 
 [tool.setuptools.dynamic]
 readme = {file = ["README.rst"], content-type = "text/rst"}
 version = {file = "vcsserver/VERSION"}
 dependencies = {file = ["requirements.txt"]}
 optional-dependencies.tests = {file = ["requirements_test.txt"]}
 
 [tool.ruff]
-
-select = [
+lint.select = [
     # Pyflakes
     "F",
     # Pycodestyle
     "E",
     "W",
     # isort
     "I001"
 ]
-
-ignore = [
+lint.ignore = [
     "E501",  # line too long, handled by black
 ]
-
 # Same as Black.
 line-length = 120
 
-[tool.ruff.isort]
-
+[tool.ruff.lint.isort]
 known-first-party = ["vcsserver"]
 
 [tool.ruff.format]
 
 # Like Black, use double quotes for strings.
 quote-style = "double"
 
 # Like Black, indent with spaces, rather than tabs.
 indent-style = "space"
 
 # Like Black, respect magic trailing commas.
 skip-magic-trailing-comma = false
 
 # Like Black, automatically detect the appropriate line ending.
 line-ending = "auto"
 
-
 [tool.bumpversion]
 current_version = "5.4.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"
 replace = "{new_version}"
 regex = false
 ignore_missing_version = false
 ignore_missing_files = false
 tag = false
 sign_tags = false
 tag_name = "v{new_version}"
 tag_message = "release(version-bump): {current_version} → {new_version}"
 allow_dirty = false
 commit = false
 message = "release(version-bump): {current_version} → {new_version}"
 commit_args = ""
 setup_hooks = []
 pre_commit_hooks = []
 post_commit_hooks = []