# HG changeset patch
# User RhodeCode Admin <admin@rhodecode.com>
# Date 2023-05-24 12:27:39
# Node ID 2c99a397c1eee51e5710a2c5b71b1cd79c6c493b
# Parent  e8c454cf65a2a8813ea94b889befb437f315e98f

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

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+#SHELL = /bin/bash
 
 # set by: PATH_TO_OUTDATED_PACKAGES=/some/path/outdated_packages.py
 OUTDATED_PACKAGES = ${PATH_TO_OUTDATED_PACKAGES}
@@ -16,7 +17,7 @@ test:
 	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
@@ -32,21 +33,22 @@ test-only:
 	--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 .
diff --git a/pyproject.toml b/pyproject.toml
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ authors = [
 
 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',
@@ -24,12 +24,15 @@ classifiers = [
 [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 = [
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -47,7 +47,7 @@ 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
diff --git a/requirements_test.txt b/requirements_test.txt
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -9,30 +9,30 @@ pytest-cov==4.0.0
   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