project: switched completly to pyproject.toml

pyproject.toml

@@ -1,8 +1,35 b''
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "rhodecode-vcsserver"
-description = ""
+description = "Version Control System Server for RhodeCode"
+authors = [
+    {name = "RhodeCode GmbH", email = "[e-mail]"},
+]
+
+license = {text = "GPL V3"}
 requires-python = ">=3.10"
-version = "5.0.0"
+dynamic = ["version", "readme"]
+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"}
 
 [tool.ruff]
 select = [

vcsserver/__init__.py

@@ -18,7 +18,7 b''
 import pkgutil
 
 
-__version__ = pkgutil.get_data('vcsserver', 'VERSION').strip()
+__version__ = pkgutil.get_data('vcsserver', 'VERSION').strip().decode()
 
 # link to config for pyramid
 CONFIG = {}

vcsserver/http_main.py

@@ -464,7 +464,7 b' class HTTPApplication(object):'
 
     def status_view(self, request):
         import vcsserver
-        return {'status': 'OK', 'vcsserver_version': safe_str(vcsserver.__version__),
+        return {'status': 'OK', 'vcsserver_version': vcsserver.__version__,
                 'pid': os.getpid()}
 
     def service_view(self, request):
@@ -492,7 +492,7 b' class HTTPApplication(object):'
         resp = {
             'id': payload.get('id'),
             'result': dict(
-                version=safe_str(vcsserver.__version__),
+                version=vcsserver.__version__,
                 config=server_config,
                 app_config=app_config,
                 environ=environ,

vcsserver/tests/test_install_hooks.py

@@ -72,7 +72,7 b' class BaseInstallHooks(object):'
             content = hook_file.read()
 
         expected_env = '#!{}'.format(executable)
-        expected_rc_version = "\nRC_HOOK_VER = '{}'\n".format(safe_str(vcsserver.__version__))
+        expected_rc_version = "\nRC_HOOK_VER = '{}'\n".format(vcsserver.__version__)
         assert content.strip().startswith(expected_env)
         assert expected_rc_version in content
 

vcsserver/tweens/request_wrapper.py

@@ -65,7 +65,7 b' class RequestWrapperTween(object):'
             repo_name = call_context.get('X-RC-Repo-Name', '')
 
             count = request.request_count()
-            _ver_ = ascii_str(vcsserver.__version__)
+            _ver_ = vcsserver.__version__
             _path = safe_str(get_access_path(request.environ))
 
             ip = '127.0.0.1'