package: fix dev-env, bumped some deps to be consistent

Makefile

@@ -1,94 +1,96 b''
+#SHELL = /bin/bash
 
 # set by: PATH_TO_OUTDATED_PACKAGES=/some/path/outdated_packages.py
 OUTDATED_PACKAGES = ${PATH_TO_OUTDATED_PACKAGES}
 
 .PHONY: 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 '{}' ';'
 
 
 .PHONY: test
 ## run test-clean and tests
 test:
 	make test-clean
 	make test-only
 
 
-.PHONY:test-clean
+.PHONY: 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
 ## 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
 
 
-
 .PHONY: pip-packages
 ## Show outdated packages
 pip-packages:
 	python ${OUTDATED_PACKAGES}
 
 
-.PHONY: sdist
-## Build sdist
-sdist:
-	python setup.py sdist
+.PHONY: build
+## Build sdist/egg
+build:
+	python -m build
+
 
 .PHONY: dev-env
-## Build sdist
+## make dev-env based on the requirements files and install develop of packages
 dev-env:
+	pip install build virtualenv pipdeptree
 	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 .
 
 # Default command on calling make
 .DEFAULT_GOAL := show-help
 
 .PHONY: show-help
 show-help:
 	@echo "$$(tput bold)Available rules:$$(tput sgr0)"
 	@echo
 	@sed -n -e "/^## / { \
 		h; \
 		s/.*//; \
 		:doc" \
 		-e "H; \
 		n; \
 		s/^## //; \
 		t doc" \
 		-e "s/:.*//; \
 		G; \
 		s/\\n## /---/; \
 		s/\\n/ /g; \
 		p; \
 	}" ${MAKEFILE_LIST} \
 	| LC_ALL='C' sort --ignore-case \
 	| awk -F '---' \
 		-v ncol=$$(tput cols) \
 		-v indent=19 \
 		-v col_on="$$(tput setaf 6)" \
 		-v col_off="$$(tput sgr0)" \
 	'{ \
 		printf "%s%*s%s ", col_on, -indent, $$1, col_off; \
 		n = split($$2, words, " "); \
 		line_length = ncol - indent; \
 		for (i = 1; i <= n; i++) { \
 			line_length -= length(words[i]) + 1; \
 			if (line_length <= 0) { \
 				line_length = ncol - indent - length(words[i]) - 1; \
 				printf "\n%*s ", -indent, " "; \
 			} \
 			printf "%s ", words[i]; \
 		} \
 		printf "\n"; \
 	}'

pyproject.toml

@@ -1,51 +1,54 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"]
+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 = [
     # Pyflakes
     "F",
     # Pycodestyle
     "E",
     "W",
     # isort
     "I001"
 ]
 ignore = [
     "E501",  # line too long, handled by black
 ]
 # Same as Black.
 line-length = 120
 
 [tool.ruff.isort]
 known-first-party = ["vcsserver"]

requirements.txt

@@ -1,53 +1,53 b''
 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
 
 atomicwrites==1.4.1
 contextlib2==21.6.0
 cov-core==1.15.0
   coverage==7.2.3
 dogpile.cache==1.2.0
   decorator==5.1.1
   stevedore==5.0.0
     pbr==5.11.1
 dulwich==0.21.5
   urllib3==1.26.14
 gunicorn==20.1.0
 hg-evolve==11.0.1
 importlib-metadata==6.0.0
   zipp==3.15.0
 mercurial==6.3.3
 mock==5.0.2
 more-itertools==9.1.0
 msgpack==1.0.5
 orjson==3.8.12
 psutil==5.9.5
 py==1.11.0
 pygit2==1.12.1
   cffi==1.15.1
     pycparser==2.21
 pygments==2.15.1
 pyparsing==3.0.9
 pyramid==2.0.1
   hupper==1.12
   plaster==1.1.2
   plaster-pastedeploy==1.0.1
     pastedeploy==3.0.1
     plaster==1.1.2
   translationstring==1.4
   venusian==3.0.0
   webob==1.8.7
   zope.deprecation==5.0.0
   zope.interface==6.0.0
 redis==4.5.5
   async-timeout==4.0.2
 repoze.lru==0.7
 scandir==1.10.0
 setproctitle==1.3.2
 subvertpy==0.11.0
 wcwidth==0.2.6
 
 
 ## test related requirements
--r requirements_test.txt
+#-r requirements_test.txt
 
 ## uncomment to add the debug libraries
 #-r requirements_debug.txt

requirements_test.txt

@@ -1,45 +1,45 b''
 # test related requirements
 
 cov-core==1.15.0
   coverage==7.2.3
 mock==5.0.2
 py==1.11.0
 pytest-cov==4.0.0
   coverage==7.2.3
   pytest==7.3.1
     attrs==22.2.0
     iniconfig==2.0.0
-    packaging==23.0
+    packaging==23.1
     pluggy==1.0.0
 pytest-profiling==1.7.0
   gprof2dot==2022.7.29
   pytest==7.3.1
     attrs==22.2.0
     iniconfig==2.0.0
-    packaging==23.0
+    packaging==23.1
     pluggy==1.0.0
   six==1.16.0
 pytest-runner==6.0.0
 pytest-sugar==0.9.7
-  packaging==23.0
+  packaging==23.1
   pytest==7.3.1
     attrs==22.2.0
     iniconfig==2.0.0
-    packaging==23.0
+    packaging==23.1
     pluggy==1.0.0
   termcolor==2.3.0
 pytest-timeout==2.1.0
   pytest==7.3.1
     attrs==22.2.0
     iniconfig==2.0.0
-    packaging==23.0
+    packaging==23.1
     pluggy==1.0.0
 webtest==3.0.0
   beautifulsoup4==4.11.2
     soupsieve==2.4
   waitress==2.1.2
   webob==1.8.7
 
 # RhodeCode test-data
 rc_testdata @ https://code.rhodecode.com/upstream/rc-testdata-dist/raw/e72cda25374768bc8605a67066012428f9d90d03/rc_testdata-0.10.0.tar.gz#egg=rc_testdata
 rc_testdata==0.10.0